From 2338a8c9c53d84e269ee85843bf7bb6a0015ea2d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 13 Dec 2011 07:40:27 +0000
Subject: convert GetMangleName

---
 idl/inc/slot.hxx             |  2 +-
 idl/inc/types.hxx            | 14 +++++++-------
 idl/source/objects/slot.cxx  |  6 +++---
 idl/source/objects/types.cxx | 18 +++++++++---------
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'idl')

diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index b4036ea2ff2d..69b589f2e827 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -189,7 +189,7 @@ public:
 
     virtual sal_Bool    IsVariable() const;
     virtual sal_Bool    IsMethod() const;
-    virtual ByteString  GetMangleName( sal_Bool bVariable ) const;
+    virtual rtl::OString GetMangleName( sal_Bool bVariable ) const;
 
     SvMetaAttribute *   GetMethod() const;
     SvMetaType *        GetSlotType() const;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 4ee6889ec4d3..2fe4e2612837 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -103,7 +103,7 @@ public:
 
     virtual sal_Bool        IsMethod() const;
     virtual sal_Bool        IsVariable() const;
-    virtual ByteString      GetMangleName( sal_Bool bVariable ) const;
+    virtual rtl::OString    GetMangleName( sal_Bool bVariable ) const;
 
 
 #ifdef IDL_COMPILER
@@ -178,12 +178,12 @@ protected:
 public:
             SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
             SvMetaType();
-            SvMetaType( const ByteString & rTypeName, char cParserChar,
-                                const ByteString & rCName );
-            SvMetaType( const ByteString & rTypeName, const ByteString & rSbxName,
-                        const ByteString & rOdlName, char cParserChar,
-                        const ByteString & rCName, const ByteString & rBasicName,
-                        const ByteString & rBasicPostfix );
+            SvMetaType( const rtl::OString& rTypeName, char cParserChar,
+                                const rtl::OString& rCName );
+            SvMetaType( const rtl::OString& rTypeName, const rtl::OString& rSbxName,
+                        const rtl::OString& rOdlName, char cParserChar,
+                        const rtl::OString& rCName, const rtl::OString& rBasicName,
+                        const rtl::OString& rBasicPostfix );
 
     SvMetaAttributeMemberList & GetAttrList() const;
     sal_uLong               GetAttrCount() const
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 36115d918aab..d24a2a271012 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -300,7 +300,7 @@ sal_Bool SvMetaSlot::IsMethod() const
     return b;
 }
 
-ByteString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
+rtl::OString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
 {
     if( !bVariable )
     {
@@ -1393,7 +1393,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
             rOutStm << '.';
             if ( !IsVariable() || !GetType() ||
                  GetType()->GetBaseType()->GetType() != TYPE_STRUCT )
-                rOutStm << GetMangleName( sal_False ).GetBuffer();
+                rOutStm << GetMangleName( sal_False ).getStr();
             rOutStm << "\",";
         }
         else
@@ -1414,7 +1414,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
 
     {
         rOutStm << ",\"";
-        rOutStm << GetMangleName( sal_False ).GetBuffer();
+        rOutStm << GetMangleName( sal_False ).getStr();
         rOutStm << "\"";
     }
 
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 6f364fc3bf08..fa6d473a0f1f 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -183,7 +183,7 @@ sal_Bool SvMetaAttribute::IsVariable() const
     return pType->GetType() != TYPE_METHOD;
 }
 
-ByteString SvMetaAttribute::GetMangleName( sal_Bool ) const
+rtl::OString SvMetaAttribute::GetMangleName( sal_Bool ) const
 {
     return GetName();
 }
@@ -769,8 +769,8 @@ SvMetaType::SvMetaType()
 {
 }
 
-SvMetaType::SvMetaType( const ByteString & rName, char cPC,
-                        const ByteString & rCName )
+SvMetaType::SvMetaType( const rtl::OString& rName, char cPC,
+                        const rtl::OString& rCName )
     CTOR
 {
     SetName( rName );
@@ -778,13 +778,13 @@ SvMetaType::SvMetaType( const ByteString & rName, char cPC,
     aCName = rCName;
 }
 
-SvMetaType::SvMetaType( const ByteString & rName,
-                        const ByteString & rSbxName,
-                        const ByteString & rOdlName,
+SvMetaType::SvMetaType( const rtl::OString& rName,
+                        const rtl::OString& rSbxName,
+                        const rtl::OString& rOdlName,
                         char cPc,
-                        const ByteString & rCName,
-                        const ByteString & rBasicName,
-                        const ByteString & rBasicPostfix )
+                        const rtl::OString& rCName,
+                        const rtl::OString& rBasicName,
+                        const rtl::OString& rBasicPostfix )
     CTOR
 {
     SetName( rName );
-- 
cgit