[Libreoffice-commits] core.git: desktop/source

Stephan Bergmann sbergman at redhat.com
Fri Nov 1 11:05:58 CET 2013


 desktop/source/app/cmdlineargs.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 2c2ff538908e4c61987469c9e09325c2b479b185
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 1 11:03:34 2013 +0100

    fdo#71005 Remove odd "Workaround for automated testing"
    
    ...that got added by 62ee5e1a752033344c172ad2380a5f1e2492330a "INTEGRATION: CWS
    calcshare2: #i85794# workaround for automated testing" but does not make much
    sense, esp. as all our (subsequent-)checks each use a dedicated, throwaway
    UserInstallation anyway.
    
    Change-Id: I64ca47a7d7ee3c2eb2ab33eebcec5a79a7e3d0df

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index a2a1cd1..0a63a3b 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -453,8 +453,6 @@ bool CommandLineArgs::InterpretCommandLineParameter( const OUString& aArg, OUStr
     else if ( oArg == "nolockcheck" )
     {
         m_nolockcheck = true;
-        // Workaround for automated testing
-        ::svt::DocumentLockFile::AllowInteraction( false );
     }
 #endif
     else if ( oArg == "help" || aArg == "-h" || aArg == "-?" )


More information about the Libreoffice-commits mailing list