Hi Michael,
could you please review the attached diff before I commit it to the
libreoffice-3-3 branch? I adds your suggested change for
https://bugs.freedesktop.org/show_bug.cgi?id=31770 to make the BrOffice
branding optional.
It works like a charm here.
Best Regards,
Petr
--- unotools/source/config/configmgr.cxx.old 2010-11-30 21:37:52.000000000 +0100
+++ unotools/source/config/configmgr.cxx 2010-12-02 21:11:38.000000000 +0100
@@ -402,10 +402,12 @@ Any ConfigManager::GetDirectConfigProper
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() )
--- unotools/source/config/makefile.mk.old 2010-11-11 16:22:48.000000000 +0100
+++ unotools/source/config/makefile.mk 2010-12-02 21:04:52.000000000 +0100
@@ -37,6 +37,9 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
+.IF "$(ENABLE_BROFFICE)"=="TRUE"
+CDEFS+=-DENABLE_BROFFICE
+.ENDIF
# --- Files -------------------------------------
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
