From 3f30749a7ab6cdd328f0e2e29fa0d241099cb3ca Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 15 Apr 2008 09:26:57 +0000 Subject: [PATCH] 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 --- desktop/source/app/app.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index ddc7302df55d..4ac1493e56bc 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 #include #include +#include #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; } }