You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2012/08/13 09:13:13 UTC

svn commit: r1372282 - /incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx

Author: jsc
Date: Mon Aug 13 07:13:12 2012
New Revision: 1372282

URL: http://svn.apache.org/viewvc?rev=1372282&view=rev
Log:
#120501# don't show start center if -nodefault is used

Patch By: arielch
Review By: jsc

Modified:
    incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx

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=1372282&r1=1372281&r2=1372282&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx (original)
+++ incubator/ooo/branches/AOO34/main/desktop/source/app/app.cxx Mon Aug 13 07:13:12 2012
@@ -2054,7 +2054,11 @@ void Desktop::Main()
 
         if ( !pExecGlobals->bRestartRequested )
         {
-            if ((!pCmdLineArgs->WantsToLoadDocument() && !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsHeadless() && !pCmdLineArgs->IsQuickstart()) &&
+            if ((!pCmdLineArgs->IsNoDefault() &&
+                 !pCmdLineArgs->WantsToLoadDocument() &&
+                 !pCmdLineArgs->IsInvisible() &&
+                 !pCmdLineArgs->IsHeadless() &&
+                 !pCmdLineArgs->IsQuickstart()) &&
                 (SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) &&
                 (!bExistsRecoveryData                                                  ) &&
                 (!bExistsSessionData                                                   ) &&