don't inherit from ByteString

4 files changed, 18 insertions, 16 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index d40aab316c18..a669f02fc247 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -153,7 +153,7 @@ public:
 
     virtual sal_Bool                SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
     void                        SetDescription( const ByteString& rText )
-                                { aDescription = rText; }
+                                { aDescription.setString(rText); }
     const SvHelpContext&        GetHelpContext() const { return aHelpContext; }
     virtual const SvString &    GetName() const { return aName; }
     virtual const SvString &    GetHelpText() const { return aHelpText; }
@@ -183,7 +183,7 @@ public:
     const SvString &    GetName() const
                         {
                             return ( !aRef.Is()
-                                    || SvMetaName::GetName().Len() )
+                                    || SvMetaName::GetName().getString().Len() )
                                 ? SvMetaName::GetName()
                                 : aRef->GetName();
                         }
@@ -191,7 +191,7 @@ public:
     const SvString &    GetHelpText() const
                         {
                             return ( !aRef.Is()
-                                    || SvMetaName::GetHelpText().Len() )
+                                    || SvMetaName::GetHelpText().getString().Len() )
                                 ? SvMetaName::GetHelpText()
                                 : aRef->GetHelpText();
                         }
@@ -199,7 +199,7 @@ public:
     const SvString &    GetConfigName() const
                         {
                             return ( !aRef.Is()
-                                    || SvMetaName::GetConfigName().Len() )
+                                    || SvMetaName::GetConfigName().getString().Len() )
                                 ? SvMetaName::GetConfigName()
                                 : aRef->GetConfigName();
                         }
@@ -207,7 +207,7 @@ public:
     const SvString &    GetDescription() const
                         {
                             return ( !aRef.Is()
-                                    || SvMetaName::GetDescription().Len() )
+                                    || SvMetaName::GetDescription().getString().Len() )
                                 ? SvMetaName::GetDescription()
                                 : aRef->GetDescription();
                         }
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index d52a38b9a81e..0231bd7357f8 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -164,11 +164,11 @@ public:
     SvIdentifier()
     {
     }
-    void setIdentifier(const ByteString & rStr)
+    void setString(const ByteString & rStr)
     {
         m_aStr = rStr;
     }
-    const ByteString& getIdentifier() const
+    const ByteString& getString() const
     {
         return m_aStr;
     }
@@ -204,13 +204,15 @@ public:
 };
 
 
-class SvString : public ByteString
+class SvString
 {
+private:
+    ByteString m_aStr;
 public:
-                SvString(){};
-    SvString &  operator = ( const ByteString & rStr )
-                { ByteString::operator =( rStr ); return *this; }
-    sal_Bool        IsSet() const { return Len() != 0; }
+    SvString() {}
+    void setString(const ByteString &rStr) { m_aStr = rStr; }
+    const ByteString& getString() const { return m_aStr; }
+    sal_Bool IsSet() const { return m_aStr.Len() != 0; }
     friend SvStream& operator << (SvStream &, const SvString &);
     friend SvStream& operator >> (SvStream &, SvString &);
 
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 633187c817cb..f1269321d8e1 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -68,12 +68,12 @@ public:
                         SvMetaModule();
 
     const String &      GetIdlFileName() const { return aIdlFileName; }
-    const ByteString &      GetModulePrefix() const { return aModulePrefix; }
+    const ByteString &      GetModulePrefix() const { return aModulePrefix.getString(); }
 
     virtual sal_Bool        SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
 
-    const ByteString &      GetHelpFileName() const { return aHelpFileName; }
-    const ByteString &      GetTypeLibFileName() const { return aTypeLibFile; }
+    const ByteString &      GetHelpFileName() const { return aHelpFileName.getString(); }
+    const ByteString &      GetTypeLibFileName() const { return aTypeLibFile.getString(); }
 
     const SvMetaAttributeMemberList & GetAttrList() const { return aAttrList; }
     const SvMetaTypeMemberList & GetTypeList() const { return aTypeList; }
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 0b7c4bacace6..921e4a9ec865 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -209,7 +209,7 @@ public:
     int                 GetCall1() const;
 
     void                SetBasicName(const ByteString& rName)
-                        { aBasicName.setIdentifier(rName); }
+                        { aBasicName.setString(rName); }
 
     const ByteString &      GetBasicName() const;
     ByteString              GetBasicPostfix() const;