diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:29:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:29:33 +0000 |
| commit | fffae28952f20fed693df4de8b8645cf0aedabfa (patch) | |
| tree | 401f5ce0e113adc69199f43b79ff542f012d1d3c /vcl/win | |
| parent | 6fd747bf0e1f8374d52e26e823d2186275d5e8fb (diff) | |
bah, need to tweak for pre c++0x
This reverts commit d00fc0e293852cfc019ffaffa65bee327397677b.
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 44ca911f6987..cf7941e67805 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -160,10 +160,10 @@ ImplFontAttrCache::ImplFontAttrCache( const String& rFileNameURL, const String& ImplDevFontAttributes aDFA; for(;;) { - aFontFileURL = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); + aCacheFile.ReadByteString( aFontFileURL, RTL_TEXTENCODING_UTF8 ); if( !aFontFileURL.Len() ) break; - aDFA.maName = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); + aCacheFile.ReadByteString( aDFA.maName, RTL_TEXTENCODING_UTF8 ); short n; aCacheFile >> n; aDFA.meWeight = static_cast<FontWeight>(n); @@ -195,8 +195,8 @@ ImplFontAttrCache::~ImplFontAttrCache() { const String rFontFileURL( (*aIter).first ); const ImplDevFontAttributes& rDFA( (*aIter).second ); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8); + aCacheFile.WriteByteString( rFontFileURL, RTL_TEXTENCODING_UTF8 ); + aCacheFile.WriteByteString( rDFA.maName, RTL_TEXTENCODING_UTF8 ); aCacheFile << static_cast<short>(rDFA.meWeight); aCacheFile << static_cast<short>(rDFA.meItalic); @@ -205,12 +205,13 @@ ImplFontAttrCache::~ImplFontAttrCache() aCacheFile << static_cast<short>(rDFA.meFamily); aCacheFile << static_cast<short>(rDFA.mbSymbolFlag != false); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8); + aCacheFile.WriteByteStringLine( rDFA.maStyleName, RTL_TEXTENCODING_UTF8 ); ++aIter; } // EOF Marker - write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8); + String aEmptyStr; + aCacheFile.WriteByteString( aEmptyStr, RTL_TEXTENCODING_UTF8 ); } } } |