diff options
Diffstat (limited to 'desktop/source/migration/pages.cxx')
| -rw-r--r-- | desktop/source/migration/pages.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx index 544ea04dee..1840ed8997 100644 --- a/desktop/source/migration/pages.cxx +++ b/desktop/source/migration/pages.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ #include <osl/file.hxx> #include <unotools/bootstrap.hxx> #include <unotools/configmgr.hxx> -#include <svtools/regoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/regoptions.hxx> +#include <unotools/useroptions.hxx> #include <sfx2/basedlgs.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -334,7 +334,7 @@ MigrationPage::MigrationPage( svt::OWizardMachine* parent, const ResId& resid) sal_Bool MigrationPage::commitPage( CommitPageReason _eReason ) { if (_eReason == eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone) - { + { EnterWait(); Migration::doMigration(); LeaveWait(); @@ -421,7 +421,7 @@ UpdateCheckPage::UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resi sal_Bool UpdateCheckPage::commitPage( CommitPageReason _eReason ) { if ( _eReason == eTravelForward ) - { + { try { Reference < XNameReplace > xUpdateAccess; Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -548,7 +548,7 @@ sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason ) { if ( _eReason == eFinish ) { - ::svt::RegOptions aOptions; + ::utl::RegOptions aOptions; rtl::OUString aEvent; if ( m_rbNow.IsChecked()) @@ -605,7 +605,7 @@ void RegistrationPage::prepareSingleMode() bool RegistrationPage::hasReminderDateCome() { - return ::svt::RegOptions().hasReminderDateCome(); + return ::utl::RegOptions().hasReminderDateCome(); } void RegistrationPage::executeSingleMode() @@ -622,7 +622,7 @@ void RegistrationPage::executeSingleMode() if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater ) pPage->commitPage( IWizardPage::eFinish ); if ( eMode != RegistrationPage::rmLater ) - ::svt::RegOptions().removeReminder(); + ::utl::RegOptions().removeReminder(); } // ----------------------------------------------------------------------- |