From fba010a77757d0724a0da4a902e78f17cdf15b65 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 22 Jan 2012 07:29:33 +0000
Subject: make sot ByteString free

---
 idl/inc/object.hxx            |  2 +-
 idl/source/cmptools/lex.cxx   |  6 +++---
 idl/source/objects/object.cxx | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'idl')

diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 6690f82218f8..5319f41226be 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -102,7 +102,7 @@ class SvMetaClass : public SvMetaType
 
     void                InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
                                     SvMetaClassList & rClassList,
-                                    const ByteString & rPrefix, SvIdlDataBase& rBase );
+                                    const rtl::OString& rPrefix, SvIdlDataBase& rBase );
 
 protected:
     virtual void    ReadAttributesSvIdl( SvIdlDataBase & rBase,
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 6d5f398b2235..a1f0ed2f6c3b 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -339,13 +339,13 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
             aBuf.append(static_cast<char>(c));
             c = GetFastNextChar();
         }
-        ByteString aStr = aBuf.makeStringAndClear();
-        if( aStr.EqualsIgnoreCaseAscii( aStrTrue ) )
+        rtl::OString aStr = aBuf.makeStringAndClear();
+        if( aStr.equalsIgnoreAsciiCase( aStrTrue ) )
         {
             rToken.nType = SVTOKEN_BOOL;
             rToken.bBool = sal_True;
         }
-        else if( aStr.EqualsIgnoreCaseAscii( aStrFalse ) )
+        else if( aStr.equalsIgnoreAsciiCase( aStrFalse ) )
         {
             rToken.nType = SVTOKEN_BOOL;
             rToken.bBool = sal_False;
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 30d936041099..8313db18204e 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -471,7 +471,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const ByteString & rShellName,
 
 void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
                             SvMetaClassList &rClassList,
-                            const ByteString & rPrefix, SvIdlDataBase& rBase)
+                            const rtl::OString& rPrefix, SvIdlDataBase& rBase)
 {
     // was this class already written?
     for ( size_t i = 0, n = rClassList.size(); i < n ; ++i )
@@ -589,7 +589,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
     std::vector<sal_uLong> aSuperList;
     SvMetaClassList classList;
     SvSlotElementList aSlotList;
-    InsertSlots(aSlotList, aSuperList, classList, ByteString(), rBase);
+    InsertSlots(aSlotList, aSuperList, classList, rtl::OString(), rBase);
     for ( size_t i = 0, n = aSlotList.size(); i < n; ++i )
     {
         SvSlotElement *pEle = aSlotList[ i ];
@@ -703,16 +703,16 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
         aSuperName = GetSuperClass()->GetName().getString();
     const char * pSup = aSuperName.getStr();
 
-    ByteString name = GetSvName();
+    rtl::OString name = GetSvName();
     // GetTypeName
-    rOutStm << "SvGlobalName " << name.GetBuffer() << "::GetTypeName() const" << endl
+    rOutStm << "SvGlobalName " << name.getStr() << "::GetTypeName() const" << endl
     << '{' << endl
     << "\treturn ClassName();" << endl
     << '}' << endl;
 
     SvMetaModule * pMod = GetModule();
     // FillTypeLibInfo
-    rOutStm << "sal_Bool " << name.GetBuffer() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
+    rOutStm << "sal_Bool " << name.getStr() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
     << "\t                               sal_uInt16 * pMajor," << endl
     << "\t                               sal_uInt16 * pMinor ) const" << endl
     << '{' << endl
@@ -728,7 +728,7 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
     << '}' << endl;
 
     // FillTypeLibInfo
-    rOutStm << "sal_Bool " << name.GetBuffer() << "::FillTypeLibInfo( ByteString * pName,"
+    rOutStm << "sal_Bool " << name.getStr() << "::FillTypeLibInfo( ByteString * pName,"
     << "\t                               sal_uInt16 * pMajor," << endl
     << "\t                               sal_uInt16 * pMinor ) const" << endl;
     rOutStm << '{' << endl
@@ -742,7 +742,7 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
     << "\treturn sal_True;" << endl
     << '}' << endl;
 
-    rOutStm << "void " << name.GetBuffer() << "::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )" << endl
+    rOutStm << "void " << name.getStr() << "::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )" << endl
     << '{' << endl
     << "\t" << pSup << "::Notify( rBC, rHint );" << endl
     << '}' << endl;
-- 
cgit