[Libreoffice-commits] .: desktop/source

[Jan Holesovsky]

 desktop/source/app/langselect.cxx |    6 ++----
 desktop/source/app/langselect.hxx |    1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 43061897a69fbfc765170e87588f843fbd540e52
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Mar 19 14:34:35 2012 +0100

    Workaround a strange wine / mingw crash.

diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 7dbc4f2..387dca0 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -72,8 +72,6 @@ sal_Bool LanguageSelection::bFoundLanguage = sal_False;
 OUString LanguageSelection::aFoundLanguage;
 LanguageSelection::LanguageSelectionStatus LanguageSelection::m_eStatus = LS_STATUS_OK;
 
-const OUString LanguageSelection::usFallbackLanguage(RTL_CONSTASCII_USTRINGPARAM("en-US"));
-
 static sal_Bool existsURL( OUString const& sURL )
 {
     using namespace osl;
@@ -335,11 +333,11 @@ OUString LanguageSelection::getLanguageString()
         }
     }
     // fallback 1: en-US
-    OUString usFB = usFallbackLanguage;
+    OUString usFB(RTL_CONSTASCII_USTRINGPARAM("en-US"));
     if (isInstalledLanguage(usFB))
     {
         bFoundLanguage = sal_True;
-        aFoundLanguage = usFallbackLanguage;
+        aFoundLanguage = OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));
         return aFoundLanguage;
     }
 
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 2fd8074..93b6bc4 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -54,7 +54,6 @@ public:
     static LanguageSelectionStatus getStatus();
 
 private:
-    static const rtl::OUString usFallbackLanguage;
     static rtl::OUString aFoundLanguage;
     static sal_Bool bFoundLanguage;
     static LanguageSelectionStatus m_eStatus;