diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:40:33 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:40:33 +0100 |
| commit | 5a86941e3398ce714765a1e29b973a0dafc55e41 (patch) | |
| tree | 21fb56f4ca2ed3739d760b6421f5ab519eb408b0 /unotools/source/config/configmgr.cxx | |
| parent | bc221867dcab6415d635f0d7ba145012cf8d4e66 (diff) | |
| parent | fe2e07e730e22257376293170a2a438b238804e3 (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
unotools/source/config/configmgr.cxx
vcl/source/gdi/pdfwriter_impl.cxx
Diffstat (limited to 'unotools/source/config/configmgr.cxx')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index fdd141c2d004..5df150c9edb6 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -373,10 +373,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(RTL_CONSTASCII_USTRINGPARAM("BrOffice")); else +#endif sBrandName = BrandName::get(); if ( eProp == PRODUCTNAME && sBrandName.getLength() ) |