diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 09:26:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 09:26:57 +0000 |
| commit | 191a8b48432098e344b0f0d58544e955efc84b54 (patch) | |
| tree | 0f3ed985af332146c4943d1eab3d383e4e6a253c /desktop/source/app | |
| parent | 6e596edeb0e79e4e3f62c49c6ecaf3aec69c0c48 (diff) | |
INTEGRATION: CWS reglater3_DEV300 (1.211.22.3.2); FILE MERGED
2008/04/02 18:17:52 pb 1.211.22.3.2.1: fix: #155679# remove ReminderDate on FirstStart
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/app.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d440a4a4a1..872447f8a7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: app.cxx,v $ - * $Revision: 1.218 $ + * $Revision: 1.219 $ * * This file is part of OpenOffice.org. * @@ -149,6 +149,7 @@ #include <svtools/apearcfg.hxx> #include <svtools/misccfg.hxx> #include <svtools/filter.hxx> +#include <svtools/regoptions.hxx> #include "langselect.hxx" @@ -1559,6 +1560,7 @@ void Desktop::Main() // First Start Wizard if ( IsFirstStartWizardNeeded() && !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()) @@ -1571,7 +1573,8 @@ void Desktop::Main() lArgs[1].Value <<= GetLicensePath(); xFirstStartJob->execute(lArgs) >>= bDone; - if (!bDone) { + if ( !bDone ) + { return; } } @@ -2908,7 +2911,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) else if ( rAppEvent.GetEvent() == APPEVENT_OPEN_STRING ) { OUString aOpenURL(rAppEvent.GetData().GetBuffer()); - + CommandLineArgs* pCmdLine = GetCommandLineArgs(); if ( !pCmdLine->IsInvisible() && !pCmdLine->IsTerminateAfterInit() ) { @@ -2923,7 +2926,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) else if ( rAppEvent.GetEvent() == APPEVENT_PRINT_STRING ) { OUString aPrintURL(rAppEvent.GetData().GetBuffer()); - + CommandLineArgs* pCmdLine = GetCommandLineArgs(); if ( !pCmdLine->IsInvisible() && !pCmdLine->IsTerminateAfterInit() ) { |