needs more work first

This reverts commit 92f396733ebc518bcb7a9eae2dd3169d333b82b9.

7 files changed, 22 insertions, 18 deletions

diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index a7e35cd65e41..3e5c3e6e0c25 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -85,7 +85,7 @@ String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const
 
     bool bSeekOk = rFib.GetStream().Seek(nPos) == nPos;
     rtl::OString a8BitStr = bSeekOk ?
-        read_uInt8s_ToOString(rFib.GetStream(), nLen) :
+        read_uInt8s_AsOString(rFib.GetStream(), nLen) :
         rtl::OString();
     return rtl::OStringToOUString(a8BitStr, RTL_TEXTENCODING_MS_1252);
 }
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0ab1cf6e175a..99237686e660 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -281,7 +281,7 @@ bool Sttb::Read( SvStream& rS )
         {
             SBBItem aItem;
             rS >> aItem.cchData;
-            aItem.data = read_LEuInt16s_ToOUString(rS, aItem.cchData);
+            aItem.data = read_LEuInt16s_AsOUString(rS, aItem.cchData);
             dataItems.push_back( aItem );
         }
     }
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index b72fcd55ab51..c6702c55fc50 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4334,7 +4334,7 @@ void WW8RStyle::ImportOldFormatStyles()
             }
             else               // user style
             {
-                rtl::OString aTmp = read_uInt8s_ToOString(rSt, nCount);
+                rtl::OString aTmp = read_uInt8s_AsOString(rSt, nCount);
                 nByteCount += aTmp.getLength();
                 sName = rtl::OStringToOUString(aTmp, eStructChrSet);
             }
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 56981ace6280..56631b9bb225 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1910,16 +1910,23 @@ Err:
     return false;
 }
 
+String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc)
+{
+    sal_uInt8 nLen(0);
+    rStrm >> nLen;
+    return rtl::OStringToOUString(read_uInt8s_AsOString(rStrm, nLen), eEnc);
+}
+
 String read_LEuInt16_PascalString(SvStream& rStrm)
 {
     sal_uInt16 nLen(0);
     rStrm >> nLen;
-    return read_LEuInt16s_ToOUString(rStrm, nLen);
+    return read_LEuInt16s_AsOUString(rStrm, nLen);
 }
 
 String read_uInt8_BeltAndBracesString(SvStream& rStrm, rtl_TextEncoding eEnc)
 {
-    rtl::OUString aRet = read_lenPrefixed_uInt8s_ToOUString<sal_uInt8>(rStrm, eEnc);
+    String aRet = read_uInt8_PascalString(rStrm, eEnc);
     rStrm.SeekRel(sizeof(sal_uInt8)); // skip null-byte at end
     return aRet;
 }
@@ -1961,11 +1968,11 @@ xub_StrLen WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr,
             nLen = USHRT_MAX - 1;
 
         if( bIsUnicode )
-            rStr.Append(String(read_LEuInt16s_ToOUString(rStrm, nLen)));
+            rStr.Append(String(read_LEuInt16s_AsOUString(rStrm, nLen)));
         else
         {
             // Alloc method automatically sets Zero at the end
-            rtl::OString aByteStr = read_uInt8s_ToOString(rStrm, nLen);
+            rtl::OString aByteStr = read_uInt8s_AsOString(rStrm, nLen);
             rStr.Append(String(rtl::OStringToOUString(aByteStr, eEnc)));
         }
         nTotalRead  += nLen;
@@ -3869,7 +3876,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen
                 {
                     sal_uInt8 nBChar(0);
                     rStrm >> nBChar;
-                    rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar);
+                    rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar);
                     rArray.push_back(rtl::OStringToOUString(aTmp, eCS));
                 }
 
@@ -3902,7 +3909,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen
                     {
                         sal_uInt8 nBChar(0);
                         rStrm >> nBChar;
-                        rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar);
+                        rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar);
                         pValueArray->push_back(rtl::OStringToOUString(aTmp, eCS));
                     }
                 }
@@ -3928,7 +3935,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen
                 ++nRead;
                 if (nBChar)
                 {
-                    rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar);
+                    rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar);
                     nRead += aTmp.getLength();
                     rArray.push_back(rtl::OStringToOUString(aTmp, eCS));
                 }
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 9cac3eb94c28..a323b84bae6e 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -136,10 +136,7 @@ public:
 
 //Read a Pascal-style, i.e. single byte string length followed
 //by string contents
-inline String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc)
-{
-    return read_lenPrefixed_uInt8s_ToOUString<sal_uInt8>(rStrm, eEnc);
-}
+String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc);
 String read_LEuInt16_PascalString(SvStream& rStrm);
 
 //Belt and Braces strings, i.e. Pascal-style strings followed by
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 06cf7e707e2b..d615d860619c 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -1128,7 +1128,7 @@ bool TcgSttbfCore::Read( SvStream& rS )
         for ( sal_Int32 index = 0; index < cData; ++index )
         {
             rS >> dataItems[ index ].cchData;
-            dataItems[ index ].data = read_LEuInt16s_ToOUString(rS, dataItems[index].cchData);
+            dataItems[ index ].data = read_LEuInt16s_AsOUString(rS, dataItems[index].cchData);
             rS >> dataItems[ index ].extraData;
         }
     }
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 422e090b06e9..6f3905105b8b 100755
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1993,9 +1993,9 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
         }   // report useful error!!
 
         rtl_TextEncoding eEncoding = DDE_TXT_ENCODING;
-        aApp = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding);
-        aTopic = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding);
-        aItem = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding);
+        aApp = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding);
+        aTopic = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding);
+        aItem = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding);
     }
 
     String aCmd;