summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/dispatchwatcher.cxx7
-rw-r--r--desktop/source/migration/pages.cxx23
-rw-r--r--desktop/source/migration/wizard.hrc6
-rw-r--r--desktop/source/migration/wizard.src18
4 files changed, 11 insertions, 43 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 0c6de1db2225..c1dd167ea39a 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -122,7 +122,7 @@ DispatchWatcher* DispatchWatcher::GetDispatchWatcher()
DispatchWatcher::DispatchWatcher()
- : m_nRequestCount(1)
+ : m_nRequestCount(0)
{
}
@@ -437,12 +437,13 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
}
::osl::ClearableMutexGuard aGuard( GetMutex() );
- m_nRequestCount--;
+ bool bEmpty = (m_nRequestCount == 0);
+ aGuard.clear();
// No more asynchronous requests?
// The requests are removed from the request container after they called back to this
// implementation via statusChanged!!
- if ( !m_nRequestCount && ! bNoTerminate /*m_aRequestContainer.empty()*/ )
+ if ( bEmpty && !bNoTerminate /*m_aRequestContainer.empty()*/ )
{
// We have to check if we have an open task otherwise we have to shutdown the office.
Reference< XFramesSupplier > xTasksSupplier( xDesktop, UNO_QUERY );
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 0122caba945e..80c5849ee4d9 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -100,9 +100,10 @@ WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_B
// we need to choose the welcome text that is diplayed
// choices are the default text, default text+migradtion,
// OEM and extended OEM
- switch (checkOEM())
- {
- case OEM_NONE:
+ // No OEM is built, remove the check
+// switch (checkOEM())
+// {
+// case OEM_NONE:
// check for migration
if (Migration::checkMigration())
{
@@ -112,27 +113,11 @@ WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_B
m_ftBody.SetText( aText );
}
else
- if (bIsEvalVersion && (! bNoEvalText))
- {
- String aText(WizardResId(STR_WELCOME_EVAL));
- aText.SearchAndReplaceAll( UniString::CreateFromAscii("%EVALDAYS"), UniString::CreateFromAscii("90"));
- m_ftBody.SetText( aText );
- }
- else
if ( ! m_bLicenseNeedsAcceptance )
{
String aText(WizardResId(STR_WELCOME_WITHOUT_LICENSE));
m_ftBody.SetText( aText );
}
- break;
- case OEM_NORMAL:
- m_ftBody.SetText(String(WizardResId(STR_WELCOME_OEM)));
- break;
- case OEM_EXTENDED:
- m_ftBody.SetText(String(WizardResId(STR_WELCOME_OEM_EXT)));
- break;
- }
-
}
diff --git a/desktop/source/migration/wizard.hrc b/desktop/source/migration/wizard.hrc
index 317465736f6e..cdd045164123 100644
--- a/desktop/source/migration/wizard.hrc
+++ b/desktop/source/migration/wizard.hrc
@@ -88,13 +88,13 @@
#define STR_STATE_MIGRATION RID_FIRSTSTSTART_START+102
#define STR_STATE_REGISTRATION RID_FIRSTSTSTART_START+103
#define STR_WELCOME_MIGRATION RID_FIRSTSTSTART_START+104
-#define STR_WELCOME_OEM RID_FIRSTSTSTART_START+105
-#define STR_WELCOME_OEM_EXT RID_FIRSTSTSTART_START+106
+// FREE RID_FIRSTSTSTART_START+105
+// FREE RID_FIRSTSTSTART_START+106
#define STR_LICENSE_ACCEPT RID_FIRSTSTSTART_START+107
#define STR_LICENSE_DECLINE RID_FIRSTSTSTART_START+108
#define STR_FINISH RID_FIRSTSTSTART_START+109
#define STR_STATE_USER RID_FIRSTSTSTART_START+110
-#define STR_WELCOME_EVAL RID_FIRSTSTSTART_START+111
+// FREE RID_FIRSTSTSTART_START+111
#define STR_STATE_UPDATE_CHECK RID_FIRSTSTSTART_START+112
#define STR_WELCOME_WITHOUT_LICENSE RID_FIRSTSTSTART_START+113
#define STR_REGISTRATION_OOO RID_FIRSTSTSTART_START+114
diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src
index 3b49e070fa6d..634c8fe12dcb 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -79,24 +79,6 @@ String STR_WELCOME_MIGRATION
Text [ en-US ] = "This wizard will guide you through the license agreement, the transfer of user data from %OLD_VERSION and the registration of %PRODUCTNAME.\n\nClick 'Next' to continue.";
};
-String STR_WELCOME_OEM
-{
- Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\nImportant information is contained in the readme file which is located in the %PRODUCTNAME product directory. Please read this file carefully.\n\nYou can also find detailed information on the Sun Internet pages at\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nClick 'Next' to continue.";
-};
-String STR_WELCOME_OEM_EXT
-{
- Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\n"
- "Important information is contained in the readme files which are located in the %PRODUCTNAME product directory. "
- "Please read these files carefully. You can also find detailed information on the Sun website \n\n"
- "http://www.sun.com/%PRODUCTNAME.\n\nSupport:\n\nGet FREE software support valid for 60 days from "
- "date of purchase. To take advantage of this offer, visit the website below.\n\n"
- "http://www.sun.com/star/service\n\nClick 'Next' to continue.";
-};
-
-String STR_WELCOME_EVAL
-{
- Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\nThis version lets you evaluate the full functionality. However, since it is an evaluation version, you will be able to start it within %EVALDAYS days after installation. To find out more about the %PRODUCTNAME product, visit www.sun.com/%PRODUCTNAME\n\nClick 'Next' to continue.";
-};
String STR_WELCOME_WITHOUT_LICENSE
{
generated by cgit (git 2.34.1) at 2025-02-15 16:58:45 +0000