incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1346821 - in /incubator/ooo/branches/AOO34: ./ main/desktop/source/app/app.cxx
Date Wed, 06 Jun 2012 10:52:52 GMT
Author: orw
Date: Wed Jun  6 10:52:51 2012
New Revision: 1346821

URL: http://svn.apache.org/viewvc?rev=1346821&view=rev
Log:
#119102# - merge fix from trunk into branch AOO34

Modified:
    incubator/ooo/branches/AOO34/   (props changed)
    incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx

Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk:r1338503

Modified: incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx?rev=1346821&r1=1346820&r2=1346821&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx (original)
+++ incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx Wed Jun  6 10:52:51 2012
@@ -2021,7 +2021,7 @@ void Desktop::Main()
 
         if ( !pExecGlobals->bRestartRequested )
         {
-            if ((!pCmdLineArgs->WantsToLoadDocument() && !pCmdLineArgs->IsInvisible()
&& !pCmdLineArgs->IsHeadless() ) &&
+            if ((!pCmdLineArgs->WantsToLoadDocument() && !pCmdLineArgs->IsInvisible()
&& !pCmdLineArgs->IsHeadless() && !pCmdLineArgs->IsQuickstart()) &&
                 (SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE))
&&
                 (!bExistsRecoveryData                                                  )
&&
                 (!bExistsSessionData                                                   )
&&



Mime
View raw message