more SvStream:operator>> conversion

Convert the template based read_lenPrefixed methods to regular
methods.

Change-Id: Ifd0e93aca055e55a0575e4377ec2b8e266dfb019
Reviewed-on: https://gerrit.libreoffice.org/7895
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

5 files changed, 14 insertions, 14 deletions

diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index bf73df07ec35..b6385180f532 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -368,16 +368,16 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     aParams.clear();
     sal_uInt16 nParam;
-    aComment = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+    aComment = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm,
         RTL_TEXTENCODING_ASCII_US);
-    aHelpFile = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+    aHelpFile = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm,
         RTL_TEXTENCODING_ASCII_US);
     rStrm.ReadUInt32( nHelpId ).ReadUInt16( nParam );
     while( nParam-- )
     {
         sal_uInt16 nType, nFlags;
         sal_uInt32 nUserData = 0;
-        OUString aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+        OUString aName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm,
             RTL_TEXTENCODING_ASCII_US);
         rStrm.ReadUInt16( nType ).ReadUInt16( nFlags );
         if( nVer > 1 )
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 7c40c7868b4f..267a252f1901 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -302,7 +302,7 @@ sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer );
     if( bRes )
     {
-        aElemClass = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+        aElemClass = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm,
             RTL_TEXTENCODING_ASCII_US);
         rStrm.ReadUChar( bAddRemoveOk );
     }
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 7095294d5abb..135fcc4c069c 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -635,8 +635,8 @@ sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     }
     sal_uInt32 nSize;
     OUString aDfltProp;
-    aClassName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, RTL_TEXTENCODING_ASCII_US);
-    aDfltProp = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, RTL_TEXTENCODING_ASCII_US);
+    aClassName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US);
+    aDfltProp = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US);
     sal_uIntPtr nPos = rStrm.Tell();
     rStrm.ReadUInt32( nSize );
     if( !LoadPrivateData( rStrm, nVer ) )
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 25c3d652b7eb..5245d86b90d5 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1420,7 +1420,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
         case SbxSINGLE:
         {
             // Floats as ASCII
-            OUString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r,
+            OUString aVal = read_uInt16_lenPrefixed_uInt8s_ToOUString(r,
                 RTL_TEXTENCODING_ASCII_US);
             double d;
             SbxDataType t;
@@ -1436,7 +1436,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
         case SbxDOUBLE:
         {
             // Floats as ASCII
-            OUString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r,
+            OUString aVal = read_uInt16_lenPrefixed_uInt8s_ToOUString(r,
                 RTL_TEXTENCODING_ASCII_US);
             SbxDataType t;
             if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK )
@@ -1464,7 +1464,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
         }
         case SbxSTRING:
         {
-            OUString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r,
+            OUString aVal = read_uInt16_lenPrefixed_uInt8s_ToOUString(r,
                 RTL_TEXTENCODING_ASCII_US);
             if( !aVal.isEmpty() )
                     aData.pOUString = new OUString( aVal );
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index bc60b86549f6..fa1e66a487ae 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -512,7 +512,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
         {
             return sal_False;
         }
-        maName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+        maName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm,
                                                                 RTL_TEXTENCODING_ASCII_US);
         sal_uInt32 nTemp;
         rStrm.ReadUInt32( nTemp );
@@ -522,7 +522,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     {
         rStrm.SeekRel( -1L );
         rStrm.ReadUInt16( nType );
-        maName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+        maName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm,
                                                                 RTL_TEXTENCODING_ASCII_US);
         sal_uInt32 nTemp;
         rStrm.ReadUInt32( nTemp );
@@ -548,7 +548,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
         case SbxSINGLE:
         {
             // Floats as ASCII
-            aTmpString = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(
+            aTmpString = read_uInt16_lenPrefixed_uInt8s_ToOUString(
                     rStrm, RTL_TEXTENCODING_ASCII_US);
             double d;
             SbxDataType t;
@@ -564,7 +564,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
         case SbxDOUBLE:
         {
             // Floats as ASCII
-            aTmpString = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+            aTmpString = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm,
                                                                         RTL_TEXTENCODING_ASCII_US);
             SbxDataType t;
             if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK )
@@ -575,7 +575,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
             break;
         }
         case SbxSTRING:
-            aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+            aVal = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm,
                                                                   RTL_TEXTENCODING_ASCII_US);
             break;
         case SbxEMPTY: