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
This commit is contained in:
Vladimir Glazounov 2008-04-15 09:26:57 +00:00
parent 1fd28832e7
commit 3f30749a7a

View file

@ -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;
}
}