diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-13 15:11:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-15 09:21:47 +0100 |
| commit | 5bc86df0c8a013af21d5fbc8f6e024db6f0b9936 (patch) | |
| tree | 5002ba913af96f971728b92aae239c28424ea7f5 /vcl | |
| parent | callcatcher: remove ResetObjectBars_Impl (diff) | |
| download | core-5bc86df0c8a013af21d5fbc8f6e024db6f0b9936.tar.gz core-5bc86df0c8a013af21d5fbc8f6e024db6f0b9936.zip | |
lets keep original encoding
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index db30b9d757b4..ca8cc2fee13c 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2812,7 +2812,7 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) ) return FALSE; const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding(); - const ByteString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) ); + const rtl::OString aToFile(rtl::OUStringToOString(aSysPath, aThreadEncoding)); // check if the font has a CFF-table const DWORD nCffTag = CalcTag( "CFF " ); @@ -2840,7 +2840,7 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, pCharMap->DeReference(); // TODO: and and use a RAII object // provide a font subset from the CFF-table - FILE* pOutFile = fopen( aToFile.GetBuffer(), "wb" ); + FILE* pOutFile = fopen( aToFile.getStr(), "wb" ); rInfo.LoadFont( FontSubsetInfo::CFF_FONT, aRawCffData.get(), aRawCffData.size() ); bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, pOutFile, NULL, nRealGlyphIds, pEncoding, nGlyphCount, pGlyphWidths ); @@ -2929,7 +2929,7 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, free( pMetrics ); // write subset into destination file - nRC = ::CreateTTFromTTGlyphs( aSftTTF.get(), aToFile.GetBuffer(), aShortIDs, + nRC = ::CreateTTFromTTGlyphs( aSftTTF.get(), aToFile.getStr(), aShortIDs, aTempEncs, nGlyphCount, 0, NULL, 0 ); return (nRC == SF_OK); } |