Kaydet (Commit) 62ee5e1a authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS calcshare2 (1.35.22); FILE MERGED

2008/03/31 13:17:00 mav 1.35.22.1: #i85794# workaround for automated testing
üst 88d06aaf
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: cmdlineargs.cxx,v $ * $RCSfile: cmdlineargs.cxx,v $
* $Revision: 1.36 $ * $Revision: 1.37 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <svtools/documentlockfile.hxx>
using namespace rtl; using namespace rtl;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
using namespace com::sun::star::uri; using namespace com::sun::star::uri;
...@@ -407,6 +409,9 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& ...@@ -407,6 +409,9 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-nolockcheck" )) == sal_True ) else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-nolockcheck" )) == sal_True )
{ {
SetBoolParam_Impl( CMD_BOOLPARAM_NOLOCKCHECK, sal_True ); SetBoolParam_Impl( CMD_BOOLPARAM_NOLOCKCHECK, sal_True );
// Workaround for automated testing
::svt::DocumentLockFile::AllowInteraction( sal_False );
return sal_True; return sal_True;
} }
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-help" )) else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-help" ))
......
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