CWS-TOOLING: integrate CWS sw30bf15_DEV300

1 files changed, 25 insertions, 20 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index adc8eff16b..4b809b5c1e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1339,32 +1339,37 @@ void Desktop::Main()
         tools::InitTestToolLib();
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} tools::InitTestToolLib" );
 
-        // First Start Wizard
-        if ( IsFirstStartWizardNeeded() && !pCmdLineArgs->IsNoFirstStartWizard() )
+        // First Start Wizard allowed ?
+        if ( ! pCmdLineArgs->IsNoFirstStartWizard())
         {
-            ::svt::RegOptions().removeReminder(); // remove patch registration reminder
-            Reference< XJob > xFirstStartJob( xSMgr->createInstance(
-                DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY );
-            if (xFirstStartJob.is())
+            RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ FirstStartWizard" );
+        
+            if (IsFirstStartWizardNeeded())
             {
-                sal_Bool bDone = sal_False;
-                Sequence< NamedValue > lArgs(2);
-                lArgs[0].Name    = ::rtl::OUString::createFromAscii("LicenseNeedsAcceptance");
-                lArgs[0].Value <<= LicenseNeedsAcceptance();
-                lArgs[1].Name    = ::rtl::OUString::createFromAscii("LicensePath");
-                lArgs[1].Value <<= GetLicensePath();
-
-                xFirstStartJob->execute(lArgs) >>= bDone;
-                if ( !bDone )
+                ::svt::RegOptions().removeReminder(); // remove patch registration reminder
+                Reference< XJob > xFirstStartJob( xSMgr->createInstance(
+                    DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY );
+                if (xFirstStartJob.is())
                 {
-                    return;
+                    sal_Bool bDone = sal_False;
+                    Sequence< NamedValue > lArgs(2);
+                    lArgs[0].Name    = ::rtl::OUString::createFromAscii("LicenseNeedsAcceptance");
+                    lArgs[0].Value <<= LicenseNeedsAcceptance();
+                    lArgs[1].Name    = ::rtl::OUString::createFromAscii("LicensePath");
+                    lArgs[1].Value <<= GetLicensePath();
+    
+                    xFirstStartJob->execute(lArgs) >>= bDone;
+                    if ( !bDone )
+                    {
+                        return;
+                    }
                 }
             }
+            else if ( RegistrationPage::hasReminderDateCome() )
+                RegistrationPage::executeSingleMode();
+            
+            RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
         }
-        else if ( RegistrationPage::hasReminderDateCome() )
-            RegistrationPage::executeSingleMode();
-
-        RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
 
         // keep a language options instance...
         pLanguageOptions.reset( new SvtLanguageOptions(sal_True));