diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 21:12:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 22:06:28 +0200 |
| commit | 2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2 (patch) | |
| tree | 1119c8730bd6628f10923dc3357ecae7d71bad28 /vcl/aqua | |
| parent | 29e11dd13efc2d1325b0f424788484bc8ecf0ce1 (diff) | |
Undo basis/brand split: merge basis share/ into brand share/.
Diffstat (limited to 'vcl/aqua')
| -rw-r--r-- | vcl/aqua/source/gdi/salgdi.cxx | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 19f073d78a98..5ac685cfcb2b 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -1688,7 +1688,7 @@ static bool AddLocalTempFontDirs( void ) return false; bFirst = false; - // add private font files found in brand and base layer + // add private font files rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ); rtl_bootstrap_expandMacros( &aBrandStr.pData ); @@ -1698,19 +1698,7 @@ static bool AddLocalTempFontDirs( void ) rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); aBrandFontDir.append( "/share/fonts/truetype/" ); - bool bBrandSuccess = AddTempFontDir( aBrandFontDir.getStr() ); - - rtl::OUString aBaseStr( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) ); - rtl_bootstrap_expandMacros( &aBaseStr.pData ); - rtl::OUString aBaseSysPath; - OSL_VERIFY( osl_getSystemPathFromFileURL( aBaseStr.pData, &aBaseSysPath.pData ) == osl_File_E_None ); - - rtl::OStringBuffer aBaseFontDir( aBaseSysPath.getLength()*2 ); - aBaseFontDir.append( rtl::OUStringToOString( aBaseSysPath, RTL_TEXTENCODING_UTF8 ) ); - aBaseFontDir.append( "/share/fonts/truetype/" ); - bool bBaseSuccess = AddTempFontDir( aBaseFontDir.getStr() ); - - return bBrandSuccess && bBaseSuccess; + return AddTempFontDir( aBrandFontDir.getStr() ); } void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) |