disentangle Read/WriteByteString OUString variants

The ones which use a definite 8-bit encoding read/write pascal-style
strings with a 16bit length prefix.

The ones which use a definite 16-bit encoding read/write pascal-style
UTF-16 strings with a 32bit length prefix, i.e. not ByteStrings at all

The "I dunno" ones might be UTF-16 strings or 8-bit strings, depending
on the charset. Rename to ReadUniOrByteString like the other
similar horrors to flag this misery

6 files changed, 33 insertions, 40 deletions

diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 017042692225..059b1fe85320 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.ReadByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() );
-    rIStm.ReadByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() );
+    rIStm.ReadUniOrByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() );
+    rIStm.ReadUniOrByteString( 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.WriteByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() );
-    rOStm.WriteByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() );
+    rOStm.WriteUniOrByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() );
+    rOStm.WriteUniOrByteString( 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 796659cfdaa5..8d3ef576690e 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -334,9 +334,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
                     rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen );
                     while( rIStream.Tell() < nFirstPos + nLen )
                     {
-                        String aKey, aValue;
-                        rIStream.ReadByteString( aKey, RTL_TEXTENCODING_UTF8 );
-                        rIStream.ReadByteString( aValue, RTL_TEXTENCODING_UTF8 );
+                        String aKey = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
+                        String aValue = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
                         if( aKey.EqualsAscii( "COMPAT_DUPLEX_MODE" ) )
                         {
                             if( aValue.EqualsAscii( "DUPLEX_UNKNOWN" ) )
@@ -407,8 +406,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 )
             {
-                rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 );
-                rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 );
+                write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8);
+                write_lenPrefixed_uInt8s_FromOUString(rOStream, 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 9961705cbb6c..2fd96e835910 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.WriteByteString( maStr, pData->meActualCharSet );
+    rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm   << mnIndex;
     rOStm   << mnLen;
 
@@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     COMPAT( rIStm );
     rIStm   >> maPt;
-    rIStm.ReadByteString( maStr, pData->meActualCharSet );
+    rIStm.ReadUniOrByteString( 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.WriteByteString( maStr, pData->meActualCharSet );
+    rOStm.WriteUniOrByteString( 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.ReadByteString( maStr, pData->meActualCharSet );
+    rIStm.ReadUniOrByteString( 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.WriteByteString( maStr, pData->meActualCharSet );
+    rOStm.WriteUniOrByteString( 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.ReadByteString( maStr, pData->meActualCharSet );
+    rIStm.ReadUniOrByteString( 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.WriteByteString( maStr, pData->meActualCharSet );
+    rOStm.WriteUniOrByteString( 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.ReadByteString( maStr, pData->meActualCharSet );
+    rIStm.ReadUniOrByteString( 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 6a4cabaecbfe..9cede2527aaa 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 );
 
-    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 );
+    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 << rInfo.mnStatus;
     rOStream << rInfo.mnJobs;
 
@@ -296,15 +296,10 @@ SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo )
 {
     VersionCompat aCompat( rIStream, STREAM_READ );
 
-    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;
+    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);
     rIStream >> rInfo.mnStatus;
     rIStream >> rInfo.mnJobs;
 
diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx
index 2077eedc4acd..16b08c4de17a 100644
--- a/vcl/source/gdi/rendergraphic.cxx
+++ b/vcl/source/gdi/rendergraphic.cxx
@@ -192,10 +192,9 @@ void RenderGraphic::ImplGetDefaults() const
 ::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic )
 {
     ::VersionCompat aVCompat( rIStm, STREAM_READ );
-    String          aGraphicDataMimeType;
     sal_uInt32      nGraphicDataLength = 0;
 
-    rIStm.ReadByteString( aGraphicDataMimeType, RTL_TEXTENCODING_ASCII_US );
+    rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_ASCII_US);
     rIStm >> nGraphicDataLength;
 
     rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength );
@@ -215,7 +214,8 @@ void RenderGraphic::ImplGetDefaults() const
     ::VersionCompat     aVCompat( rOStm, STREAM_WRITE, 1 );
     const sal_uInt32    nGraphicDataLength = rRenderGraphic.GetGraphicDataLength();
 
-    rOStm.WriteByteString( rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US );
+    write_lenPrefixed_uInt8s_FromOUString(rOStm, 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 cf7941e67805..44ca911f6987 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(;;)
     {
-        aCacheFile.ReadByteString( aFontFileURL, RTL_TEXTENCODING_UTF8 );
+        aFontFileURL = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8);
         if( !aFontFileURL.Len() )
             break;
-        aCacheFile.ReadByteString( aDFA.maName, RTL_TEXTENCODING_UTF8 );
+        aDFA.maName = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, 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 );
-                aCacheFile.WriteByteString( rFontFileURL, RTL_TEXTENCODING_UTF8 );
-                aCacheFile.WriteByteString( rDFA.maName, RTL_TEXTENCODING_UTF8 );
+                write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8);
+                write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8);
 
                 aCacheFile << static_cast<short>(rDFA.meWeight);
                 aCacheFile << static_cast<short>(rDFA.meItalic);
@@ -205,13 +205,12 @@ ImplFontAttrCache::~ImplFontAttrCache()
                 aCacheFile << static_cast<short>(rDFA.meFamily);
                 aCacheFile << static_cast<short>(rDFA.mbSymbolFlag != false);
 
-                aCacheFile.WriteByteStringLine( rDFA.maStyleName, RTL_TEXTENCODING_UTF8 );
+                write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8);
 
                 ++aIter;
             }
             // EOF Marker
-            String aEmptyStr;
-            aCacheFile.WriteByteString( aEmptyStr, RTL_TEXTENCODING_UTF8 );
+            write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8);
         }
     }
 }