4 files changed, 8 insertions, 8 deletions
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 40ae0ddd68ce..5c1bb40b9652 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -220,7 +220,7 @@ SvStream& WriteSvIdentifier(SvStream & rStm, const SvIdentifier & r )
 
 SvStream& operator >> (SvStream & rStm, SvIdentifier & r )
 {
-    r.setString(read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm));
+    r.setString(read_uInt16_lenPrefixed_uInt8s_ToOString(rStm));
     return rStm;
 }
 
@@ -333,7 +333,7 @@ SvStream& WriteSvString(SvStream & rStm, const SvString & r )
 
 SvStream& operator >> (SvStream & rStm, SvString & r )
 {
-    r.setString(read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm));
+    r.setString(read_uInt16_lenPrefixed_uInt8s_ToOString(rStm));
     return rStm;
 }
 
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 170053a857ed..2d3b9c5c7075 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -57,9 +57,9 @@ void SvMetaModule::Load( SvPersistStream & rStm )
     rStm >> aAttrList;
     // browser
     aIdlFileName = rStm.ReadUniOrByteString( rStm.GetStreamCharSet() );
-    aHelpFileName.setString(read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm));
-    aSlotIdFile.setString(read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm));
-    aModulePrefix.setString(read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm));
+    aHelpFileName.setString(read_uInt16_lenPrefixed_uInt8s_ToOString(rStm));
+    aSlotIdFile.setString(read_uInt16_lenPrefixed_uInt8s_ToOString(rStm));
+    aModulePrefix.setString(read_uInt16_lenPrefixed_uInt8s_ToOString(rStm));
 
     // read compiler data
     sal_uInt16 nCmpLen;
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 55592dc6ee54..606e48ca6818 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -44,7 +44,7 @@ void SvClassElement::Load( SvPersistStream & rStm )
         return;
     }
     if( nMask & 0x01 ) rStm >> aAutomation;
-    if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm);
+    if( nMask & 0x02 ) aPrefix = read_uInt16_lenPrefixed_uInt8s_ToOString(rStm);
     if( nMask & 0x04 )
     {
         SvMetaClass * p;
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index b964f0f7ad54..c7a69a9ad176 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1772,7 +1772,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm )
         OSL_FAIL( "wrong format" );
         return;
     }
-    if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm);
+    if( nMask & 0x01 ) aEnumValue = read_uInt16_lenPrefixed_uInt8s_ToOString(rStm);
 }
 
 void SvMetaEnumValue::Save( SvPersistStream & rStm )
@@ -1829,7 +1829,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm )
         return;
     }
     if( nMask & 0x01 ) rStm >> aEnumValueList;
-    if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm);
+    if( nMask & 0x02 ) aPrefix = read_uInt16_lenPrefixed_uInt8s_ToOString(rStm);
 }
 
 void SvMetaTypeEnum::Save( SvPersistStream & rStm )