From 6708977331c933b3483b9fe5f66d981b51fd8d49 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 21 Dec 2011 10:30:10 +0000
Subject: needs more work first

This reverts commit 92f396733ebc518bcb7a9eae2dd3169d333b82b9.
---
 idl/source/objects/bastype.cxx |  8 ++++----
 idl/source/objects/module.cxx  | 12 ++++++------
 idl/source/objects/object.cxx  |  4 ++--
 idl/source/objects/types.cxx   |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'idl')

diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index afeb0046730d..15c56c088ea0 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -228,13 +228,13 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
 
 SvStream& operator << (SvStream & rStm, const SvIdentifier & r )
 {
-    write_lenPrefixed_uInt8s_FromOString(rStm, r);
+    rStm.WriteByteString( r );
     return rStm;
 }
 
 SvStream& operator >> (SvStream & rStm, SvIdentifier & r )
 {
-    r = read_lenPrefixed_uInt8s_ToOString(rStm);
+    rStm.ReadByteString( r );
     return rStm;
 }
 
@@ -343,13 +343,13 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
 
 SvStream& operator << (SvStream & rStm, const SvString & r )
 {
-    write_lenPrefixed_uInt8s_FromOString(rStm, r);
+    rStm.WriteByteString( r );
     return rStm;
 }
 
 SvStream& operator >> (SvStream & rStm, SvString & r )
 {
-    r = read_lenPrefixed_uInt8s_ToOString(rStm);
+    rStm.ReadByteString( r );
     return rStm;
 }
 
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 4fd5c78f7f6f..c2be3e232494 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -66,9 +66,9 @@ void SvMetaModule::Load( SvPersistStream & rStm )
     rStm >> aAttrList;
     // browser
     rStm.ReadByteString( aIdlFileName );
-    aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm);
-    aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm);
-    aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm);
+    rStm.ReadByteString( aHelpFileName );
+    rStm.ReadByteString( aSlotIdFile );
+    rStm.ReadByteString( aModulePrefix );
 
     // read compiler data
     sal_uInt16 nCmpLen;
@@ -91,9 +91,9 @@ void SvMetaModule::Save( SvPersistStream & rStm )
     rStm << aAttrList;
     // browser
     rStm.WriteByteString( aIdlFileName );
-    write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName);
-    write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile);
-    write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix);
+    rStm.WriteByteString( aHelpFileName );
+    rStm.WriteByteString( aSlotIdFile );
+    rStm.WriteByteString( aModulePrefix );
 
     // write compiler data
     sal_uInt16 nCmpLen = 0;
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 798acbc1e180..0b3e1cf193e3 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -55,7 +55,7 @@ void SvClassElement::Load( SvPersistStream & rStm )
         return;
     }
     if( nMask & 0x01 ) rStm >> aAutomation;
-    if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm);
+    if( nMask & 0x02 ) rStm.ReadByteString( aPrefix );
     if( nMask & 0x04 )
     {
         SvMetaClass * p;
@@ -75,7 +75,7 @@ void SvClassElement::Save( SvPersistStream & rStm )
     // write data
     rStm << nMask;
     if( nMask & 0x01 ) rStm << aAutomation;
-    if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix);
+    if( nMask & 0x02 ) rStm.WriteByteString( aPrefix );
     if( nMask & 0x04 ) rStm << xClass;
 }
 
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index f2488aa0498b..06db9ed18910 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1780,7 +1780,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm )
         OSL_FAIL( "wrong format" );
         return;
     }
-    if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString(rStm);
+    if( nMask & 0x01 ) rStm.ReadByteString( aEnumValue );
 }
 
 void SvMetaEnumValue::Save( SvPersistStream & rStm )
@@ -1793,7 +1793,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
 
     // write data
     rStm << nMask;
-    if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue);
+    if( nMask & 0x01 ) rStm.WriteByteString( aEnumValue );
 }
 
 sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
@@ -1837,7 +1837,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm )
         return;
     }
     if( nMask & 0x01 ) rStm >> aEnumValueList;
-    if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm);
+    if( nMask & 0x02 ) rStm.ReadByteString( aPrefix );
 }
 
 void SvMetaTypeEnum::Save( SvPersistStream & rStm )
@@ -1852,7 +1852,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
     // write data
     rStm << nMask;
     if( nMask & 0x01 ) rStm << aEnumValueList;
-    if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix);
+    if( nMask & 0x02 ) rStm.WriteByteString( aPrefix );
 }
 
 void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
-- 
cgit