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

[Petr Mladek]

 unotools/source/config/configmgr.cxx |    2 ++
 unotools/source/config/makefile.mk   |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit a59b2654ea02b058a6ab60e30be517713d8758e1
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Dec 3 16:10:23 2010 +0100

    use BrOffice name only with --enable-broffice (fdo#31770)
    
    reviewed by Michael Meeks <mmeeks at novell.com>

diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 763871c..7b57234 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 27e8f67..9a8e8d2 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 -------------------------------------