Attachment 40680 Details for Bug 31770 – possible solution using locale and configmr

[patch] possible solution using locale and configmr

configmgr.cxx.diff (text/plain), 1.26 KB, created by Petr Mladek on 2010-11-30 12:52:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Mladek

Created: 2010-11-30 12:52:21 UTC

Size: 1.26 KB

patch

obsolete

>--- unotools/source/config/configmgr.cxx.old	2010-11-11 16:22:48.000000000 +0100
>+++ unotools/source/config/configmgr.cxx	2010-11-30 21:33:16.000000000 +0100
>@@ -38,6 +38,7 @@
> #include <com/sun/star/container/XNameContainer.hpp>
> #include <com/sun/star/beans/PropertyValue.hpp>
> #include <osl/diagnose.h>
>+#include <i18npool/mslangid.hxx>
> #include <rtl/bootstrap.hxx>
> #include <rtl/instance.hxx>
> #if OSL_DEBUG_LEVEL > 0
>@@ -399,10 +400,17 @@ Any ConfigManager::GetDirectConfigProper
>     }
> 
>     Any aRet;
>-    ::rtl::OUString &rBrandName = BrandName::get();
>-    if ( eProp == PRODUCTNAME && rBrandName.getLength() )
>+
>+    ::rtl::OUString sBrandName;
>+    LanguageType nType = MsLangId::getSystemUILanguage();
>+    if ( nType == LANGUAGE_PORTUGUESE_BRAZILIAN )
>+	    sBrandName = OUString::createFromAscii("BrOffice");
>+    else 
>+	    sBrandName = BrandName::get();
>+	    
>+    if ( eProp == PRODUCTNAME && sBrandName.getLength() )
>     {
>-        aRet <<= rBrandName;
>+        aRet <<= sBrandName;
>         return aRet;
>     }
> 
>@@ -551,7 +559,7 @@ Any ConfigManager::GetDirectConfigProper
>     }
> 
>     if ( eProp == PRODUCTNAME )
>-        aRet >>= rBrandName;
>+        aRet >>= sBrandName;
> 
>     if ( eProp == PRODUCTXMLFILEFORMATNAME )
>         aRet >>= rXMLFileFormatName;

Actions: View | Splinter Review

Attachments on bug 31770: 40410 | 40680 | 40959

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.