[Libreoffice-commits] .: unotools/Library_utl.mk unotools/source

[Tor Lillqvist]

 unotools/Library_utl.mk              |    1 -
 unotools/source/config/configmgr.cxx |    8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit f47b152a345e7a66bfa0f55b30a52d6d5f9a9bc5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 26 13:53:37 2011 +0300

    Kill BrOffice, fdo#36262

diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index f229c01..1a86c46 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_set_include,utl,\
 $(eval $(call gb_Library_set_defs,utl,\
     $$(DEFS) \
     -DUNOTOOLS_DLLIMPLEMENTATION \
-    $(if $(filter TRUE,$(ENABLE_BROFFICE)),-DENABLE_BROFFICE) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,utl,\
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 70c2448..7574228 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -378,13 +378,7 @@ 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();
+    sBrandName = BrandName::get();
 
     if ( eProp == PRODUCTNAME && sBrandName.getLength() )
     {