Kaydet (Commit) 300b39cc authored tarafından Markus Mohrhard's avatar Markus Mohrhard

don't create lock files for unit tests

special thanks to Stephan for the configuration part
üst 10b10580
......@@ -6269,6 +6269,13 @@
</info>
<value>true</value>
</prop>
<prop oor:name="UseLocking" oor:type="xs:boolean">
<info>
<desc>Allows to specify whether locking should be used at all.
Use this setting only for debugging purpose.</desc>
</info>
<value>true</value>
</prop>
<prop oor:name="ShowLinkWarningDialog" oor:type="xs:boolean">
<info>
<author>THB</author>
......
......@@ -202,6 +202,31 @@ sal_Bool IsOOoLockFileUsed()
return bOOoLockFileUsed;
}
bool IsLockingUsed()
{
bool bLocking = true;
try
{
uno::Reference< uno::XInterface > xCommonConfig = ::comphelper::ConfigurationHelper::openConfig(
::comphelper::getProcessServiceFactory(),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common" ) ),
::comphelper::ConfigurationHelper::E_STANDARD );
if ( !xCommonConfig.is() )
throw uno::RuntimeException();
::comphelper::ConfigurationHelper::readRelativeKey(
xCommonConfig,
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Misc/" ) ),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLocking" ) ) ) >>= bLocking;
}
catch( const uno::Exception& )
{
}
return bLocking;
}
} // anonymous namespace
//==========================================================
......@@ -996,6 +1021,11 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
// if user cancel the loading the ERROR_ABORT is set
sal_Bool bResult = sal_False;
if (!IsLockingUsed())
{
return sal_True;
}
if ( !GetURLObject().HasError() ) try
{
if ( pImp->m_bLocked && bLoading && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
......
......@@ -27,6 +27,19 @@
* instead of those above.
-->
<oor:data xmlns:oor="http://openoffice.org/2001/registry">
<oor:component-data oor:name="Common" oor:package="org.openoffice.Office">
<node oor:name="Misc">
<prop oor:name="UseDocumentSystemFileLocking">
<value>false</value>
</prop>
<prop oor:name="UseDocumentOOoLockFile">
<value>false</value>
</prop>
<prop oor:name="UseLocking">
<value>false</value>
</prop>
</node>
</oor:component-data>
<oor:component-data oor:name="Paths" oor:package="org.openoffice.Office">
<node oor:name="Paths">
<node oor:name="UIConfig" oor:op="replace">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment