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 | |
parent | 6fd747bf0e1f8374d52e26e823d2186275d5e8fb (diff) |
bah, need to tweak for pre c++0x
This reverts commit d00fc0e293852cfc019ffaffa65bee327397677b.
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/gdi/font.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/jobset.cxx | 9 | ||||
-rw-r--r-- | vcl/source/gdi/metaact.cxx | 16 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 21 | ||||
-rw-r--r-- | vcl/source/gdi/rendergraphic.cxx | 6 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 13 |
6 files changed, 40 insertions, 33 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 ); diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 8d3ef576690e..796659cfdaa5 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -334,8 +334,9 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen ); while( rIStream.Tell() < nFirstPos + nLen ) { - String aKey = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - String aValue = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aKey, aValue; + rIStream.ReadByteString( aKey, RTL_TEXTENCODING_UTF8 ); + rIStream.ReadByteString( aValue, RTL_TEXTENCODING_UTF8 ); if( aKey.EqualsAscii( "COMPAT_DUPLEX_MODE" ) ) { if( aValue.EqualsAscii( "DUPLEX_UNKNOWN" ) ) @@ -406,8 +407,8 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { - write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8); + rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 ); + rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 ); } write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); switch( pJobData->meDuplexMode ) diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 2fd96e835910..9961705cbb6c 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1259,7 +1259,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); + rOStm.WriteByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; @@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + rIStm.ReadByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; @@ -1408,7 +1408,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maStartPt; - rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); + rOStm.WriteByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; rOStm << nAryLen; @@ -1435,7 +1435,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) COMPAT( rIStm ); rIStm >> maStartPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + rIStm.ReadByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; rIStm >> nAryLen; @@ -1555,7 +1555,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); + rOStm.WriteByteString( maStr, pData->meActualCharSet ); rOStm << mnWidth; rOStm << mnIndex; rOStm << mnLen; @@ -1575,7 +1575,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + rIStm.ReadByteString( maStr, pData->meActualCharSet ); rIStm >> mnWidth; rIStm >> mnIndex; rIStm >> mnLen; @@ -1650,7 +1650,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maRect; - rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); + rOStm.WriteByteString( maStr, pData->meActualCharSet ); rOStm << mnStyle; sal_uInt16 i, nLen = maStr.Len(); // version 2 @@ -1668,7 +1668,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maRect; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + rIStm.ReadByteString( maStr, pData->meActualCharSet ); rIStm >> mnStyle; if ( aCompat.GetVersion() >= 2 ) // Version 2 diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 9cede2527aaa..6a4cabaecbfe 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -280,10 +280,10 @@ SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); + rOStream.WriteByteString( rInfo.maPrinterName, RTL_TEXTENCODING_UTF8 ); + rOStream.WriteByteString( rInfo.maDriver, RTL_TEXTENCODING_UTF8 ); + rOStream.WriteByteString( rInfo.maLocation, RTL_TEXTENCODING_UTF8 ); + rOStream.WriteByteString( rInfo.maComment, RTL_TEXTENCODING_UTF8 ); rOStream << rInfo.mnStatus; rOStream << rInfo.mnJobs; @@ -296,10 +296,15 @@ SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); - rInfo.maPrinterName = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maDriver = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maLocation = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maComment = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aTmp; + rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); + rInfo.maPrinterName = aTmp; + rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); + rInfo.maDriver = aTmp; + rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); + rInfo.maLocation = aTmp; + rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); + rInfo.maComment = aTmp; rIStream >> rInfo.mnStatus; rIStream >> rInfo.mnJobs; diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx index 16b08c4de17a..2077eedc4acd 100644 --- a/vcl/source/gdi/rendergraphic.cxx +++ b/vcl/source/gdi/rendergraphic.cxx @@ -192,9 +192,10 @@ void RenderGraphic::ImplGetDefaults() const ::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic ) { ::VersionCompat aVCompat( rIStm, STREAM_READ ); + String aGraphicDataMimeType; sal_uInt32 nGraphicDataLength = 0; - rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_ASCII_US); + rIStm.ReadByteString( aGraphicDataMimeType, RTL_TEXTENCODING_ASCII_US ); rIStm >> nGraphicDataLength; rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength ); @@ -214,8 +215,7 @@ void RenderGraphic::ImplGetDefaults() const ::VersionCompat aVCompat( rOStm, STREAM_WRITE, 1 ); const sal_uInt32 nGraphicDataLength = rRenderGraphic.GetGraphicDataLength(); - write_lenPrefixed_uInt8s_FromOUString(rOStm, rRenderGraphic.GetGraphicDataMimeType(), - RTL_TEXTENCODING_ASCII_US); + rOStm.WriteByteString( rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US ); rOStm << nGraphicDataLength; if( nGraphicDataLength ) 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 ); } } } |