diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-05-05 11:01:04 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-05-05 11:02:25 +0100 |
| commit | 825b62a2c64d90c7d5319136f8f3b70493448611 (patch) | |
| tree | 59a841e980f900f8aedb137e6563f996d58a4933 /unotools | |
| parent | 030ae5a58ac63511d8757204104ceb3326032d7e (diff) | |
bug 36262 - undo BrOffice branding work
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 17 | ||||
| -rw-r--r-- | unotools/source/config/makefile.mk | 4 |
2 files changed, 4 insertions, 17 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 97c1776bf95b..69b945b1c754 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 9a8e8d2d3d92..d639657eb7c6 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=\ |