[Libreoffice-commits] .: Branch 'libreoffice-3-4' - unotools/source

[Michael Meeks]

 unotools/source/config/configmgr.cxx |   17 ++++-------------
 unotools/source/config/makefile.mk   |    4 ----
 2 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit c668119c3303a9ef6f09dfc5a74f5314aecd188d
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu May 5 11:01:04 2011 +0100

    bug 36262 - undo BrOffice branding work

diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 70c2448..da74a8e 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -38,7 +38,6 @@
 #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
@@ -377,18 +376,10 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
 
     Any aRet;
 
-    ::rtl::OUString sBrandName;
-#ifdef ENABLE_BROFFICE
-    LanguageType nType = MsLangId::getRealLanguage( LANGUAGE_NONE );
-    if ( nType == LANGUAGE_PORTUGUESE_BRAZILIAN )
-        sBrandName = OUString(RTL_CONSTASCII_USTRINGPARAM("BrOffice"));
-    else
-#endif
-        sBrandName = BrandName::get();
-
-    if ( eProp == PRODUCTNAME && sBrandName.getLength() )
+    ::rtl::OUString &rBrandName = BrandName::get();
+    if ( eProp == PRODUCTNAME && rBrandName.getLength() )
     {
-        aRet <<= sBrandName;
+        aRet <<= rBrandName;
         return aRet;
     }
 
@@ -536,7 +527,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
     }
 
     if ( eProp == PRODUCTNAME )
-        aRet >>= sBrandName;
+        aRet >>= rBrandName;
 
     if ( eProp == PRODUCTXMLFILEFORMATNAME )
         aRet >>= rXMLFileFormatName;
diff --git a/unotools/source/config/makefile.mk b/unotools/source/config/makefile.mk
index 9a8e8d2..d639657 100644
--- a/unotools/source/config/makefile.mk
+++ b/unotools/source/config/makefile.mk
@@ -37,10 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE : settings.mk
 .INCLUDE :      $(PRJ)$/util$/makefile.pmk
 
-.IF "$(ENABLE_BROFFICE)"=="TRUE"
-CDEFS+=-DENABLE_BROFFICE
-.ENDIF
-
 # --- Files -------------------------------------
 
 SLOFILES=\