CWS-TOOLING: integrate CWS fwk116

2009-09-03 Mikhail Voytenko #i101453# write the default values for old entries
2009-09-03 Mikhail Voytenko #i101453# let the new default value be used
2009-09-03 Mikhail Voytenko #i101453# revert the change for xslt-transformation, the duplicate nodes should not be allowed
2009-09-03 Mikhail Voytenko #i101453# allow duplicate nodes for different modules
2009-09-03 Mikhail Voytenko #i101453# fix the special mac installation
2009-09-02 Mikhail Voytenko #i101453# correct the usage of configuration files
2009-09-02 Mikhail Voytenko #i10000# fix warning
2009-09-02 Mikhail Voytenko #i10000# fix warning
2009-09-02 Mikhail Voytenko #i96918# try to open the file for editing always
2009-09-02 Mikhail Voytenko #i51058# remove unused strings
2009-09-02 Mikhail Voytenko #i51058# remove unused strings
2009-09-01 Mikhail Voytenko #i10000# fix typo
2009-08-30 Mikhail Voytenko Rebase on DEV300_m56
2009-08-19 Mikhail Voytenko #i101732# do not generate a transparent bitmap for thumbnail
2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac
2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac
2009-08-07 Mikhail Voytenko #i103617# fix warning
2009-07-31 Carsten Driesner #i103924# Fix wrong number of arguments
2009-07-31 Mikhail Voytenko #i101207# integrate the patch
2009-07-31 Mikhail Voytenko #i103783# integrate the patch; get rid of CRLF
2009-07-31 Mikhail Voytenko #i97969# integrate the patch
2009-07-27 Carsten Driesner #i103423# Use correct request count in the ctor. Don't descrease value before checking the request count

4 files changed, 11 insertions, 43 deletions

diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index cf82148130..c3886299d3 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 1556ae56ef..b430e235c0 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 6d5c9e24df..65b825f77a 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 37a83c0871..1130bd6f05 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
 {