diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-26 13:53:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-26 13:53:37 +0300 |
| commit | 6963a83e8fb792c7cf29c3eea361173c656fcb19 (patch) | |
| tree | dc93e7177a95251e1f527a100a45202a833730da | |
| parent | b53ea6f02a3753f39ca485c21c6035f539c97873 (diff) | |
Kill BrOffice, fdo#36262
| -rw-r--r-- | unotools/Library_utl.mk | 1 | ||||
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index f229c01c2925..1a86c469996c 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 97c1776bf95b..c07a81c7b99a 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() ) { |