5 files changed, 9 insertions, 9 deletions
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 8a2fe6f65a4e..4c7b2da8fca6 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -63,7 +63,7 @@ public:
     sal_Bool        IsSet() const { return bSet; }
 
     friend SvStream& WriteSvint(SvStream & rStm, const Svint & r )
-                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm << r.bSet; return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm.WriteUInt8( r.bSet ); return rStm; }
     friend SvStream& operator >> (SvStream & rStm, Svint & r )
                 { r.nVal = (int)SvUINT32::Read( rStm ); rStm >> r.bSet ; return rStm; }
 };
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 7f517e7f4632..b315190773d2 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -214,7 +214,7 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
 
 SvStream& WriteSvIdentifier(SvStream & rStm, const SvIdentifier & r )
 {
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r.getString());
+    write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, r.getString());
     return rStm;
 }
 
@@ -327,7 +327,7 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
 
 SvStream& WriteSvString(SvStream & rStm, const SvString & r )
 {
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r.getString());
+    write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, r.getString());
     return rStm;
 }
 
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index ac9aed0930f9..72985e968cfd 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -82,9 +82,9 @@ void SvMetaModule::Save( SvPersistStream & rStm )
     WriteSvDeclPersistList( rStm, aAttrList );
     // browser
     rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() );
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aHelpFileName.getString());
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aSlotIdFile.getString());
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aModulePrefix.getString());
+    write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName.getString());
+    write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile.getString());
+    write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix.getString());
 
     // write compiler data
     sal_uInt16 nCmpLen = 0;
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index a0c3b55fbcc5..74977a1e75c5 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -64,7 +64,7 @@ void SvClassElement::Save( SvPersistStream & rStm )
     // write data
     rStm.WriteUChar( nMask );
     if( nMask & 0x01 ) rStm.WriteUChar( aAutomation );
-    if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
+    if( nMask & 0x02 ) write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aPrefix);
     if( nMask & 0x04 ) WriteSvPersistBase( rStm, xClass );
 }
 
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 89ce61f6c32e..d0ff705aa245 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1784,7 +1784,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
 
     // write data
     rStm.WriteUChar( nMask );
-    if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aEnumValue);
+    if( nMask & 0x01 ) write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue);
 }
 
 sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
@@ -1843,7 +1843,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
     // write data
     rStm.WriteUChar( nMask );
     if( nMask & 0x01 ) WriteSvDeclPersistList( rStm, aEnumValueList );
-    if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
+    if( nMask & 0x02 ) write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aPrefix);
 }
 
 namespace