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

2 files changed, 20 insertions, 18 deletions

diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index d9c3a010eccd..be2d325aef8f 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -401,7 +401,7 @@ sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, s
         sal_uInt16 eSys, eLge;
         // --- from 680/dr25 on: store strings as UTF-8
         CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
-        rStream.ReadByteString( sNumFmtString, eCharSet )
+        rStream.ReadUniOrByteString( sNumFmtString, eCharSet )
                 >> eSys >> eLge;
         eSysLanguage = (LanguageType) eSys;
         eNumFmtLanguage = (LanguageType) eLge;
@@ -486,8 +486,9 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream ) const
     aRotateMode.Store( rStream, aRotateMode.GetVersion(SOFFICE_FILEFORMAT_40) );
 
     // --- from 680/dr25 on: store strings as UTF-8
-    rStream.WriteByteString( sNumFmtString, RTL_TEXTENCODING_UTF8 )
-        << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage;
+    write_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString,
+        RTL_TEXTENCODING_UTF8);
+    rStream << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage;
 
     return 0 == rStream.GetError();
 }
@@ -779,7 +780,7 @@ sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions
         sal_Bool b;
         // --- from 680/dr25 on: store strings as UTF-8
         CharSet eCharSet = (nVal >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
-        rStream.ReadByteString( aName, eCharSet );
+        rStream.ReadUniOrByteString( aName, eCharSet );
         if( AUTOFORMAT_DATA_ID_552 <= nVal )
         {
             rStream >> nStrResId;
@@ -829,7 +830,7 @@ sal_Bool SwTableAutoFmt::LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] )
     if( bRet && ( AUTOFORMAT_OLD_DATA_ID == nVal ))
     {
         sal_Bool b;
-        rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
+        rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() );
         rStream >> b; bInclFont = b;
         rStream >> b; bInclJustify = b;
         rStream >> b; bInclFrame = b;
@@ -860,7 +861,8 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream ) const
     sal_Bool b;
     rStream << nVal;
     // --- from 680/dr25 on: store strings as UTF-8
-    rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 );
+    write_lenPrefixed_uInt8s_FromOUString(rStream, aName,
+        RTL_TEXTENCODING_UTF8 );
     rStream << nStrResId;
     rStream << ( b = bInclFont );
     rStream << ( b = bInclJustify );
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index b521578f605b..c43a2f4ed99b 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -235,7 +235,7 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName
 SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, sal_uInt16 nVersion )
 {
     CharSet eEncoding = osl_getThreadTextEncoding();
-    rStream.ReadByteString(aName, eEncoding);
+    rStream.ReadUniOrByteString(aName, eEncoding);
 
     char c;
     for(sal_uInt16 n = 0; n < MAXLEVEL; ++n )
@@ -274,7 +274,7 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const
 void SwNumRulesWithName::Store( SvStream &rStream )
 {
     CharSet eEncoding = osl_getThreadTextEncoding();
-    rStream.WriteByteString(aName, eEncoding);
+    rStream.WriteUniOrByteString(aName, eEncoding);
 
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
@@ -354,9 +354,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
             long nL;
             rStream >> cChar;       aFmt.SetStart( (sal_uInt16)cChar );
 
-            rStream.ReadByteString(sStr, eEncoding);
+            rStream.ReadUniOrByteString(sStr, eEncoding);
             aFmt.SetPrefix( sStr );
-            rStream.ReadByteString(sStr, eEncoding);
+            rStream.ReadUniOrByteString(sStr, eEncoding);
             aFmt.SetSuffix( sStr );
             rStream >> nUS;         aFmt.SetNumAdjust( SvxAdjust( nUS ) );
             rStream >> nL;          aFmt.SetLSpace( lNumIndent );
@@ -366,9 +366,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
         {
             short nShort;
             rStream >> nUS;         aFmt.SetStart( nUS );
-            rStream.ReadByteString(sStr, eEncoding);
+            rStream.ReadUniOrByteString(sStr, eEncoding);
             aFmt.SetPrefix( sStr );
-            rStream.ReadByteString(sStr, eEncoding);
+            rStream.ReadUniOrByteString(sStr, eEncoding);
             aFmt.SetSuffix( sStr );
             rStream >> nUS;         aFmt.SetNumAdjust( SvxAdjust( nUS ) );
             rStream >> nUS;         aFmt.SetAbsLSpace( nUS );
@@ -385,7 +385,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
         sal_uInt16  nPitch;
         String aName;
 
-        rStream.ReadByteString(aName, eEncoding);
+        rStream.ReadUniOrByteString(aName, eEncoding);
         rStream >> nFamily >> nCharSet >> nWidth >> nHeight >> nPitch;
 
         if( aName.Len() )
@@ -411,7 +411,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
     {
         sal_uInt16 nItemCount;
         rStream >> nCharPoolId;
-        rStream.ReadByteString(sCharFmtName, eEncoding);
+        rStream.ReadUniOrByteString(sCharFmtName, eEncoding);
         rStream >> nItemCount;
 
         while( nItemCount-- )
@@ -485,15 +485,15 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
                 << aFmt.GetBulletChar()
                 << static_cast<sal_Bool>(aFmt.GetIncludeUpperLevels() > 0)
                 << aFmt.GetStart();
-        rStream.WriteByteString( aFmt.GetPrefix(), eEncoding );
-        rStream.WriteByteString( aFmt.GetSuffix(), eEncoding );
+        rStream.WriteUniOrByteString( aFmt.GetPrefix(), eEncoding );
+        rStream.WriteUniOrByteString( aFmt.GetSuffix(), eEncoding );
         rStream << sal_uInt16( aFmt.GetNumAdjust() )
                 << aFmt.GetAbsLSpace()
                 << aFmt.GetFirstLineOffset()
                 << aFmt.GetCharTextDistance()
                 << aFmt.GetLSpace()
                 << sal_False;//aFmt.IsRelLSpace();
-        rStream.WriteByteString( aName, eEncoding );
+        rStream.WriteUniOrByteString( aName, eEncoding );
         rStream << nFamily
                 << nCharSet
                 << nWidth
@@ -501,7 +501,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
                 << nPitch;
     }
     rStream << nCharPoolId;
-    rStream.WriteByteString( sCharFmtName, eEncoding );
+    rStream.WriteUniOrByteString( sCharFmtName, eEncoding );
     rStream << aItems.Count();
 
     for( sal_uInt16 n = aItems.Count(); n; )