CWS-TOOLING: integrate CWS cmcfixes57

2009-04-16 14:44:54 +0200 cmc  r270885 : #i101062# add in uui fix and stray ^M fixes
2009-04-16 10:57:50 +0200 cmc  r270872 : #i101127# remove && || warnings
2009-04-15 17:04:23 +0200 cmc  r270857 : #i101112# remove trivial new gcc warnings
2009-04-15 17:01:01 +0200 cmc  r270856 : #i101111# remove trivial new warnings
2009-04-15 16:56:53 +0200 cmc  r270854 : #i101110# make methods consts
2009-04-15 16:52:37 +0200 cmc  r270853 : #i100225# fix visibility of component_getImplementationEnvironment and friends
2009-04-15 16:49:16 +0200 cmc  r270852 : #i101109# ? : promotion rules

2 files changed, 25 insertions, 25 deletions

diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx
index 8733cbd577e4..daf1e81bc60d 100644
--- a/extensions/source/oooimprovement/config.cxx
+++ b/extensions/source/oooimprovement/config.cxx
@@ -72,7 +72,7 @@ namespace
 
     static const OUString SOAPID = OUString::createFromAscii("OpenOffice.org Improvement Report - Version 1\n");
 
-    static const sal_Int32 incrementCfgValue(
+    static sal_Int32 incrementCfgValue(
         const Reference<XMultiServiceFactory> sm,
         const OUString& package,
         const OUString& rel_path,
@@ -103,7 +103,7 @@ namespace oooimprovement
         : m_ServiceFactory(sf)
     {}
 
-    const OUString Config::getSoapUrl()
+    OUString Config::getSoapUrl() const
     {
         OUString result;
         MyConfigurationHelper::readDirectKey(
@@ -113,7 +113,7 @@ namespace oooimprovement
         return result;
     }
 
-    const OUString Config::getSoapId()
+    OUString Config::getSoapId() const
     {
         OUString value;
         OUStringBuffer result = SOAPID;
@@ -125,7 +125,7 @@ namespace oooimprovement
         return result.makeStringAndClear();
     }
 
-    const OUString Config::getReporterEmail()
+    OUString Config::getReporterEmail() const
     {
         OUString result;
         MyConfigurationHelper::readDirectKey(
@@ -135,7 +135,7 @@ namespace oooimprovement
         return result;
     }
 
-    const OUString Config::getLogPath()
+    OUString Config::getLogPath() const
     {
         OUString result;
         MyConfigurationHelper::readDirectKey(
@@ -145,7 +145,7 @@ namespace oooimprovement
         return result;
     }
 
-    bool Config::getEnablingAllowed()
+    bool Config::getEnablingAllowed() const
     {
         bool result = false;
         MyConfigurationHelper::readDirectKey(
@@ -155,7 +155,7 @@ namespace oooimprovement
         return result;
     }
 
-    bool Config::getInvitationAccepted()
+    bool Config::getInvitationAccepted() const
     {
        bool result = false;
        MyConfigurationHelper::readDirectKey(
@@ -165,7 +165,7 @@ namespace oooimprovement
        return result;
     };
 
-    bool Config::getShowedInvitation()
+    bool Config::getShowedInvitation() const
     {
        bool result = false;
        MyConfigurationHelper::readDirectKey(
@@ -175,7 +175,7 @@ namespace oooimprovement
        return result;
     };
 
-    const OUString Config::getCompleteProductname()
+    OUString Config::getCompleteProductname() const
     {
         OUStringBuffer result;
         OUString value;
@@ -202,7 +202,7 @@ namespace oooimprovement
         return result.makeStringAndClear();
     }
 
-    const OUString Config::getSetupLocale()
+    OUString Config::getSetupLocale() const
     {
         OUString result;
         MyConfigurationHelper::readDirectKey(
@@ -212,7 +212,7 @@ namespace oooimprovement
         return result;
     }
 
-    const sal_Int32 Config::getReportCount()
+    sal_Int32 Config::getReportCount() const
     {
         sal_Int32 result = 0;
         MyConfigurationHelper::readDirectKey(
@@ -222,7 +222,7 @@ namespace oooimprovement
         return result;
     }
 
-    const sal_Int32 Config::getFailedAttempts()
+    sal_Int32 Config::getFailedAttempts() const
     {
         sal_Int32 result = 0;
         MyConfigurationHelper::readDirectKey(
@@ -232,7 +232,7 @@ namespace oooimprovement
         return result;
     }
 
-    const sal_Int32 Config::getOfficeStartCounterdown()
+    sal_Int32 Config::getOfficeStartCounterdown() const
     {
         sal_Int32 result = 0;
         MyConfigurationHelper::readDirectKey(
diff --git a/extensions/source/oooimprovement/config.hxx b/extensions/source/oooimprovement/config.hxx
index d081c77577d4..ff032a6032a5 100644
--- a/extensions/source/oooimprovement/config.hxx
+++ b/extensions/source/oooimprovement/config.hxx
@@ -43,18 +43,18 @@ namespace oooimprovement
     {
         public:
             Config(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& sf);
-            bool getEnablingAllowed();
-            bool getInvitationAccepted();
-            bool getShowedInvitation();
-            const ::rtl::OUString getCompleteProductname();
-            const ::rtl::OUString getLogPath();
-            const ::rtl::OUString getReporterEmail();
-            const ::rtl::OUString getSetupLocale();
-            const ::rtl::OUString getSoapId();
-            const ::rtl::OUString getSoapUrl();
-            const sal_Int32 getReportCount();
-            const sal_Int32 getFailedAttempts();
-            const sal_Int32 getOfficeStartCounterdown();
+            bool getEnablingAllowed() const;
+            bool getInvitationAccepted() const;
+            bool getShowedInvitation() const;
+            ::rtl::OUString getCompleteProductname() const;
+            ::rtl::OUString getLogPath() const;
+            ::rtl::OUString getReporterEmail() const;
+            ::rtl::OUString getSetupLocale() const;
+            ::rtl::OUString getSoapId() const;
+            ::rtl::OUString getSoapUrl() const;
+            sal_Int32 getReportCount() const;
+            sal_Int32 getFailedAttempts() const;
+            sal_Int32 getOfficeStartCounterdown() const;
             sal_Int32 incrementEventCount(sal_Int32 by);
             sal_Int32 incrementReportCount(sal_Int32 by);
             sal_Int32 incrementFailedAttempts(sal_Int32 by);