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/ios | |
| parent | 29e11dd13efc2d1325b0f424788484bc8ecf0ce1 (diff) | |
Undo basis/brand split: merge basis share/ into brand share/.
Diffstat (limited to 'vcl/ios')
| -rw-r--r-- | vcl/ios/source/gdi/salgdi.cxx | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx index 374c6331c69a..ce557deefc72 100644 --- a/vcl/ios/source/gdi/salgdi.cxx +++ b/vcl/ios/source/gdi/salgdi.cxx @@ -1471,7 +1471,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 ); @@ -1483,21 +1483,9 @@ static bool AddLocalTempFontDirs( void ) aBrandFontDir.append( "/share/fonts/truetype/" ); // iterate font files in that and call CTFontManagerRegisterFontsForURL for them? - bool bBrandSuccess = true; + bool bSuccess = true; - 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/" ); - - // ditto - bool bBaseSuccess = true; - - return bBrandSuccess && bBaseSuccess; + return bSuccess; } void IosSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) |