diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-12-03 16:10:23 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-12-03 16:11:22 +0100 |
| commit | a59b2654ea02b058a6ab60e30be517713d8758e1 (patch) | |
| tree | 3cd862b52db57ef61a0f363e252e9d2dd1ef5547 | |
| parent | f3dd48059efe1321c58718b4d7a220b94fbc4a2e (diff) | |
use BrOffice name only with --enable-broffice (fdo#31770)feature/winshrink
reviewed by Michael Meeks <mmeeks@novell.com>
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 2 | ||||
| -rw-r--r-- | unotools/source/config/makefile.mk | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 763871cdd0..7b57234bfd 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -402,10 +402,12 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) Any aRet; ::rtl::OUString sBrandName; +#ifdef ENABLE_BROFFICE LanguageType nType = MsLangId::getSystemUILanguage(); if ( nType == LANGUAGE_PORTUGUESE_BRAZILIAN ) sBrandName = OUString::createFromAscii("BrOffice"); else +#endif sBrandName = BrandName::get(); if ( eProp == PRODUCTNAME && sBrandName.getLength() ) diff --git a/unotools/source/config/makefile.mk b/unotools/source/config/makefile.mk index 27e8f67f88..9a8e8d2d3d 100644 --- a/unotools/source/config/makefile.mk +++ b/unotools/source/config/makefile.mk @@ -37,6 +37,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk +.IF "$(ENABLE_BROFFICE)"=="TRUE" +CDEFS+=-DENABLE_BROFFICE +.ENDIF # --- Files ------------------------------------- |