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/source/gdi/font.cxx | |
| parent | 6fd747bf0e1f8374d52e26e823d2186275d5e8fb (diff) | |
bah, need to tweak for pre c++0x
This reverts commit d00fc0e293852cfc019ffaffa65bee327397677b.
Diffstat (limited to 'vcl/source/gdi/font.cxx')
| -rw-r--r-- | vcl/source/gdi/font.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 059b1fe85320..017042692225 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -780,8 +780,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) sal_Bool bTmp; sal_uInt8 nTmp8; - rIStm.ReadUniOrByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); - rIStm.ReadUniOrByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); + rIStm.ReadByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); + rIStm.ReadByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); rIStm >> rImpl_Font.maSize; rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; @@ -823,8 +823,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) SvStream& operator<<( SvStream& rOStm, const Impl_Font& rImpl_Font ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); - rOStm.WriteUniOrByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() ); - rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); + rOStm.WriteByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() ); + rOStm.WriteByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); rOStm << rImpl_Font.maSize; rOStm << (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ); |