diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:30:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:30:24 +0000 |
| commit | 62ee5e1a752033344c172ad2380a5f1e2492330a (patch) | |
| tree | e87611070b9f0a146b3190f7de84316ef95d9ec6 | |
| parent | 88d06aaff0b33a399816b9ed57f4cba0a8d3f32a (diff) | |
INTEGRATION: CWS calcshare2 (1.35.22); FILE MERGED
2008/03/31 13:17:00 mav 1.35.22.1: #i85794# workaround for automated testing
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index aa84889f4db4..e54789db864b 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cmdlineargs.cxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.37 $ * * This file is part of OpenOffice.org. * @@ -39,6 +39,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Reference.hxx> +#include <svtools/documentlockfile.hxx> + using namespace rtl; using namespace com::sun::star::lang; using namespace com::sun::star::uri; @@ -407,6 +409,9 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-nolockcheck" )) == sal_True ) { SetBoolParam_Impl( CMD_BOOLPARAM_NOLOCKCHECK, sal_True ); + // Workaround for automated testing + ::svt::DocumentLockFile::AllowInteraction( sal_False ); + return sal_True; } else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-help" )) |