diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-12 22:42:39 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 23:26:19 +0100 |
| commit | 7a403215ec9b874174df4a82167842f0abebfe60 (patch) | |
| tree | 659362a3eb7291a0d5e8481bcf6cfe48811c4f49 | |
| parent | f01c1c91a9cad054eb078a61375ebc558bb01098 (diff) | |
vcl: convert some WNT only SvStream::operator>>
Change-Id: I1752bbc6f079feb6dc3ac3b94d2e434a4201824e
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 86333f63e153..24b2c33c4e5a 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -125,7 +125,7 @@ ImplFontAttrCache::ImplFontAttrCache( const OUString& rFileNameURL, const OUStri // check the cache version sal_uInt32 nCacheMagic; - aCacheFile >> nCacheMagic; + aCacheFile.ReadUInt32(nCacheMagic); if( nCacheMagic != ImplFontAttrCache::MAGIC ) return; // ignore cache and rewrite if no match @@ -140,12 +140,18 @@ ImplFontAttrCache::ImplFontAttrCache( const OUString& rFileNameURL, const OUStri aDFA.SetFamilyName(read_uInt16_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8)); short n; - aCacheFile >> n; aDFA.SetWeight(static_cast<FontWeight>(n)); - aCacheFile >> n; aDFA.SetItalic(static_cast<FontItalic>(n)); - aCacheFile >> n; aDFA.SetPitch(static_cast<FontPitch>(n)); - aCacheFile >> n; aDFA.SetWidthType(static_cast<FontWidth>(n)); - aCacheFile >> n; aDFA.SetFamilyType(static_cast<FontFamily>(n)); - aCacheFile >> n; aDFA.SetSymbolFlag(n != 0); + aCacheFile.ReadInt16(n); + aDFA.SetWeight(static_cast<FontWeight>(n)); + aCacheFile.ReadInt16(n); + aDFA.SetItalic(static_cast<FontItalic>(n)); + aCacheFile.ReadInt16(n); + aDFA.SetPitch(static_cast<FontPitch>(n)); + aCacheFile.ReadInt16(n); + aDFA.SetWidthType(static_cast<FontWidth>(n)); + aCacheFile.ReadInt16(n); + aDFA.SetFamilyType(static_cast<FontFamily>(n)); + aCacheFile.ReadInt16(n); + aDFA.SetSymbolFlag(n != 0); OUString styleName; aCacheFile.ReadByteStringLine( styleName, RTL_TEXTENCODING_UTF8 ); |