inheriting from ByteString is kind of weird

7 files changed, 87 insertions, 76 deletions

diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 7fdeafd36a33..d52a38b9a81e 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -156,16 +156,26 @@ public:
 };
 
 
-class SvIdentifier : public ByteString
+class SvIdentifier
 {
+private:
+    ByteString m_aStr;
 public:
-                SvIdentifier(){};
-    SvIdentifier & operator = ( const ByteString & rStr )
-                { ByteString::operator =( rStr ); return *this; }
+    SvIdentifier()
+    {
+    }
+    void setIdentifier(const ByteString & rStr)
+    {
+        m_aStr = rStr;
+    }
+    const ByteString& getIdentifier() const
+    {
+        return m_aStr;
+    }
     friend SvStream& operator << (SvStream &, const SvIdentifier &);
     friend SvStream& operator >> (SvStream &, SvIdentifier &);
 
-    sal_Bool        IsSet() const { return Len() != 0; }
+    sal_Bool        IsSet() const { return m_aStr.Len() != 0; }
     sal_Bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
     sal_Bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
                             sal_uInt16 nTab );
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 6e8841f4a15d..0b7c4bacace6 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 = rName; }
+                        { aBasicName.setIdentifier(rName); }
 
     const ByteString &      GetBasicName() const;
     ByteString              GetBasicPostfix() const;
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 365d5f3ba910..7cefabc45ab3 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -222,19 +222,19 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
                                sal_uInt16 /*nTab */ )
 {
     rOutStm << pName->GetName().GetBuffer() << '(';
-    rOutStm << GetBuffer() << ')';
+    rOutStm << getIdentifier().GetBuffer() << ')';
     return sal_True;
 }
 
 SvStream& operator << (SvStream & rStm, const SvIdentifier & r )
 {
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r);
+    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r.getIdentifier());
     return rStm;
 }
 
 SvStream& operator >> (SvStream & rStm, SvIdentifier & r )
 {
-    r = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm);
+    r.setIdentifier(read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm));
     return rStm;
 }
 
@@ -246,7 +246,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
     if( SvIdentifier::ReadSvIdl( pName, rInStm ) )
     {
         sal_uLong n;
-        if( rBase.FindId( *this, &n ) )
+        if( rBase.FindId( getIdentifier(), &n ) )
         {
             nValue = n;
             return sal_True;
@@ -254,7 +254,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
         else
         {
             ByteString aStr ("no value for identifier <");
-            aStr += *this;
+            aStr += getIdentifier();
             aStr += "> ";
             rBase.SetError( aStr, rInStm.GetToken() );
             rBase.WriteError( rInStm );
@@ -281,7 +281,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
         else
         {
             ByteString aStr ("no value for identifier <");
-            aStr += *this;
+            aStr += getIdentifier();
             aStr += "> ";
             rBase.SetError( aStr, rInStm.GetToken() );
             rBase.WriteError( rInStm );
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 9388843dc7cf..24ed04af3080 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -324,7 +324,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
     if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) )
     {
         OSL_FAIL( "Neuer Slot : " );
-        OSL_FAIL( rAttr.GetSlotId().GetBuffer() );
+        OSL_FAIL( rAttr.GetSlotId().getIdentifier().GetBuffer() );
     }
 
     for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
@@ -337,8 +337,8 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
             {
                 OSL_FAIL( "Gleicher Name in MetaClass : " );
                 OSL_FAIL( pS->GetName().GetBuffer() );
-                OSL_FAIL( pS->GetSlotId().GetBuffer() );
-                OSL_FAIL( rAttr.GetSlotId().GetBuffer() );
+                OSL_FAIL( pS->GetSlotId().getIdentifier().GetBuffer() );
+                OSL_FAIL( rAttr.GetSlotId().getIdentifier().GetBuffer() );
 
                 rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute's "));
                 aStr.append(pS->GetName());
@@ -357,8 +357,8 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
                 OSL_FAIL( "Gleiche Id in MetaClass : " );
                 OSL_FAIL(rtl::OString::valueOf(static_cast<sal_Int32>(
                     pS->GetSlotId().GetValue())).getStr());
-                OSL_FAIL( pS->GetSlotId().GetBuffer() );
-                OSL_FAIL( rAttr.GetSlotId().GetBuffer() );
+                OSL_FAIL( pS->GetSlotId().getIdentifier().GetBuffer() );
+                OSL_FAIL( rAttr.GetSlotId().getIdentifier().GetBuffer() );
 
                 rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute "));
                 aStr.append(pS->GetName());
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 831afa8f1758..0502c71a8c54 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -172,12 +172,12 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
     // create mask
     sal_uInt16 nMask = 0;
     if( aMethod.Is() )          nMask |= 0x0001;
-    if( aGroupId.Len() )        nMask |= 0x0002;
+    if( aGroupId.getIdentifier().Len() )        nMask |= 0x0002;
     if( aHasCoreId.IsSet() )    nMask |= 0x0004;
-    if( aConfigId.Len() )       nMask |= 0x0008;
-    if( aExecMethod.Len() )     nMask |= 0x0010;
-    if( aStateMethod.Len() )    nMask |= 0x0020;
-    if( aDefault.Len() )        nMask |= 0x0040;
+    if( aConfigId.getIdentifier().Len() )       nMask |= 0x0008;
+    if( aExecMethod.getIdentifier().Len() )     nMask |= 0x0010;
+    if( aStateMethod.getIdentifier().Len() )    nMask |= 0x0020;
+    if( aDefault.getIdentifier().Len() )        nMask |= 0x0040;
     if( aPseudoSlots.IsSet() )  nMask |= 0x0080;
     if( aGet.IsSet() )          nMask |= 0x0100;
     if( aSet.IsSet() )          nMask |= 0x0200;
@@ -231,7 +231,7 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
     if( aNoRecord.IsSet() )       nMask |= 0x0004;
     if( aHasDialog.IsSet() )      nMask |= 0x0008;
     if ( aDisableFlags.IsSet() )      nMask |= 0x0010;
-    if( aPseudoPrefix.Len() )     nMask |= 0x0020;
+    if( aPseudoPrefix.getIdentifier().Len() )     nMask |= 0x0020;
     if( aRecordPerSet.IsSet() )   nMask |= 0x0040;
     if( aMenuConfig.IsSet() )     nMask |= 0x0080;
     if( aToolBoxConfig.IsSet() )  nMask |= 0x0100;
@@ -335,7 +335,7 @@ sal_Bool SvMetaSlot::GetHasCoreId() const
 }
 const ByteString & SvMetaSlot::GetGroupId() const
 {
-    if( aGroupId.Len() || !GetRef() ) return aGroupId;
+    if( aGroupId.getIdentifier().Len() || !GetRef() ) return aGroupId.getIdentifier();
     return ((SvMetaSlot *)GetRef())->GetGroupId();
 }
 const ByteString & SvMetaSlot::GetDisableFlags() const
@@ -345,22 +345,22 @@ const ByteString & SvMetaSlot::GetDisableFlags() const
 }
 const ByteString & SvMetaSlot::GetConfigId() const
 {
-    if( aConfigId.Len() || !GetRef() ) return aConfigId;
+    if( aConfigId.getIdentifier().Len() || !GetRef() ) return aConfigId.getIdentifier();
     return ((SvMetaSlot *)GetRef())->GetConfigId();
 }
 const ByteString & SvMetaSlot::GetExecMethod() const
 {
-    if( aExecMethod.Len() || !GetRef() ) return aExecMethod;
+    if( aExecMethod.getIdentifier().Len() || !GetRef() ) return aExecMethod.getIdentifier();
     return ((SvMetaSlot *)GetRef())->GetExecMethod();
 }
 const ByteString & SvMetaSlot::GetStateMethod() const
 {
-    if( aStateMethod.Len() || !GetRef() ) return aStateMethod;
+    if( aStateMethod.getIdentifier().Len() || !GetRef() ) return aStateMethod.getIdentifier();
     return ((SvMetaSlot *)GetRef())->GetStateMethod();
 }
 const ByteString & SvMetaSlot::GetDefault() const
 {
-    if( aDefault.Len() || !GetRef() ) return aDefault;
+    if( aDefault.getIdentifier().Len() || !GetRef() ) return aDefault.getIdentifier();
     return ((SvMetaSlot *)GetRef())->GetDefault();
 }
 sal_Bool SvMetaSlot::GetPseudoSlots() const
@@ -451,7 +451,7 @@ sal_Bool SvMetaSlot::GetHasDialog() const
 }
 const ByteString & SvMetaSlot::GetPseudoPrefix() const
 {
-    if( aPseudoPrefix.Len() || !GetRef() ) return aPseudoPrefix;
+    if( aPseudoPrefix.getIdentifier().Len() || !GetRef() ) return aPseudoPrefix.getIdentifier();
     return ((SvMetaSlot *)GetRef())->GetPseudoPrefix();
 }
 sal_Bool SvMetaSlot::GetMenuConfig() const
@@ -653,19 +653,19 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
         aHasCoreId.WriteSvIdl( SvHash_HasCoreId(), rOutStm );
         rOutStm << ';' << endl;
     }
-    if( aGroupId.Len() )
+    if( aGroupId.getIdentifier().Len() )
     {
         WriteTab( rOutStm, nTab );
         aGroupId.WriteSvIdl( SvHash_GroupId(), rOutStm, nTab +1);
         rOutStm << ';' << endl;
     }
-    if( aExecMethod.Len() )
+    if( aExecMethod.getIdentifier().Len() )
     {
         WriteTab( rOutStm, nTab );
         aExecMethod.WriteSvIdl( SvHash_ExecMethod(), rOutStm, nTab +1);
         rOutStm << ';' << endl;
     }
-    if( aStateMethod.Len() )
+    if( aStateMethod.getIdentifier().Len() )
     {
         WriteTab( rOutStm, nTab );
         aStateMethod.WriteSvIdl( SvHash_StateMethod(), rOutStm, nTab +1);
@@ -1013,7 +1013,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
             if( GetPseudoPrefix().Len() )
                 aBuf.append(GetPseudoPrefix());
             else
-                aBuf.append(GetSlotId());
+                aBuf.append(GetSlotId().getIdentifier());
             aBuf.append('_');
             aBuf.append(aValName.Copy(pEnum->GetPrefix().Len()));
 
@@ -1023,7 +1023,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
             for( m=0; m<rBase.GetAttrList().Count(); m++ )
             {
                 SvMetaAttribute * pAttr = rBase.GetAttrList().GetObject( m );
-                if (aSId.equals(pAttr->GetSlotId()))
+                if (aSId.equals(pAttr->GetSlotId().getIdentifier()))
                 {
                     SvMetaSlot* pSlot = PTR_CAST( SvMetaSlot, pAttr );
                     xEnumSlot = pSlot->Clone();
@@ -1039,7 +1039,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
                 if ( rBase.FindId(aSId , &nValue) )
                 {
                     SvNumberIdentifier aId;
-                    *((SvIdentifier*)&aId) = aSId;
+                    aId.setIdentifier(aSId);
                     aId.SetValue(nValue);
                     xEnumSlot->SetSlotId(aId);
                 }
@@ -1171,7 +1171,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
     rOutStm << rSlotId.GetBuffer() << ',';
     const SvHelpContext& rHlpCtx = GetHelpContext();
     if( rHlpCtx.IsSet() )
-        rOutStm << rHlpCtx.GetBuffer() << ',';
+        rOutStm << rHlpCtx.getIdentifier().GetBuffer() << ',';
     else
         rOutStm << rSlotId.GetBuffer() << ',';
 
@@ -1196,8 +1196,8 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
         WriteTab( rOutStm, 4 );
 
         // SlotId
-        if( GetSlotId().Len() )
-            rOutStm << pLinkedSlot->GetSlotId().GetBuffer();
+        if( GetSlotId().getIdentifier().Len() )
+            rOutStm << pLinkedSlot->GetSlotId().getIdentifier().GetBuffer();
         else
             rOutStm << '0';
         rOutStm << ',';
@@ -1445,7 +1445,7 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
             SvMetaType * pPType     = pPar->GetType();
             WriteTab( rOutStm, 1 );
             rOutStm << "SFX_ARGUMENT("
-                << pPar->GetSlotId().GetBuffer() << ',' // SlodId
+                << pPar->GetSlotId().getIdentifier().GetBuffer() << ',' // SlodId
                 // parameter name
                 << "\"" << pPar->GetName().GetBuffer() << "\","
                 // item name
@@ -1466,7 +1466,7 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const ByteString & rShellName, sal_uInt16 n
                                 SvStream & rOutStm )
 {
     // SlotId, if not specified generate from name
-    ByteString slotId = GetSlotId();
+    ByteString slotId = GetSlotId().getIdentifier();
 
     sal_uInt16 nSCount = 0;
     if( IsMethod() )
@@ -1526,7 +1526,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
             if( GetPseudoPrefix().Len() )
                 aBuf.append(GetPseudoPrefix());
             else
-                aBuf.append(GetSlotId());
+                aBuf.append(GetSlotId().getIdentifier());
             aBuf.append('_');
             aBuf.append(aValName.Copy(pEnum->GetPrefix().Len()));
 
@@ -1569,7 +1569,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
     if( !pTable->IsKeyValid( nSId ) )
     {
         pTable->Insert( nSId, this );
-        rOutStm << "#define " << GetSlotId().GetBuffer() << '\t'
+        rOutStm << "#define " << GetSlotId().getIdentifier().GetBuffer() << '\t'
             << rtl::OString::valueOf(static_cast<sal_Int32>(nSId)).getStr()
             << endl;
     }
@@ -1585,7 +1585,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
             if( GetPseudoPrefix().Len() )
                 aBuf.append(GetPseudoPrefix());
             else
-                aBuf.append( GetSlotId() );
+                aBuf.append(GetSlotId().getIdentifier());
             aBuf.append('_');
             aBuf.append(aValName.Copy(pEnum->GetPrefix().Len()));
 
@@ -1624,7 +1624,7 @@ void WriteBool( sal_Bool bSet, SvStream& rStream )
 void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
 {
     rStrm << "PROJECT,";
-    rStrm << GetSlotId().GetBuffer() << ',';
+    rStrm << GetSlotId().getIdentifier().GetBuffer() << ',';
     rStrm
         << rtl::OString::valueOf(
             static_cast<sal_Int32>(GetSlotId().GetValue())).getStr()
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 1063baa6ccc0..4c64b21cd025 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -245,7 +245,7 @@ void SvMetaAttribute::WriteSvIdl
     pType->WriteTypePrefix( rBase, rOutStm, nTab, WRITE_IDL );
     rOutStm << ' ' << GetName().GetBuffer();
     if( aSlotId.IsSet() )
-        rOutStm << ' ' << aSlotId.GetBuffer();
+        rOutStm << ' ' << aSlotId.getIdentifier().GetBuffer();
     if( pType->GetType() == TYPE_METHOD )
         pType->WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
     sal_uLong nPos = rOutStm.Tell();
@@ -386,7 +386,7 @@ sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar )
 {
      const SvNumberIdentifier & rId = GetSlotId();
     sal_uLong n = rId.GetValue();
-    if( rBase.aStructSlotId.Len() )
+    if( rBase.aStructSlotId.getIdentifier().Len() )
     {
         n = n << 20;
         n += rBase.aStructSlotId.GetValue();
@@ -517,7 +517,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
     sal_uLong nCount = rList.Count();
 
     SvNumberIdentifier slotId = rBase.aStructSlotId;
-    if ( GetSlotId().Len() )
+    if ( GetSlotId().getIdentifier().Len() )
         rBase.aStructSlotId = GetSlotId();
 
     // offial hack interface by MM: special controls get passed with the WriteAttribute
@@ -653,7 +653,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         if( !bVariable && IsMethod() )
         {
             rOutStm << "<METHOD>" << endl
-                    << GetSlotId().GetBuffer() << endl
+                    << GetSlotId().getIdentifier().GetBuffer() << endl
                     << GetName().GetBuffer() << endl
                     << endl;    // readonly
 
@@ -691,7 +691,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             else
             {
                 rOutStm << "<PROPERTY>" << endl
-                        << GetSlotId().GetBuffer() << endl
+                        << GetSlotId().getIdentifier().GetBuffer() << endl
                         << GetName().GetBuffer() << endl;
                 if ( GetReadonly() )
                     rOutStm << "(nur lesen)" << endl;
@@ -730,7 +730,7 @@ sal_uLong SvMetaAttribute::MakeSfx( rtl::OStringBuffer& rAttrArray )
     else
     {
         rAttrArray.append('{');
-        rAttrArray.append(GetSlotId());
+        rAttrArray.append(GetSlotId().getIdentifier());
         rAttrArray.append(",\"");
         rAttrArray.append(GetName());
         rAttrArray.append("\"}");
@@ -772,7 +772,7 @@ SvMetaType::SvMetaType( const rtl::OString& rName, char cPC,
 {
     SetName( rName );
     cParserChar = cPC;
-    aCName = rCName;
+    aCName.setIdentifier(rCName);
 }
 
 SvMetaType::SvMetaType( const rtl::OString& rName,
@@ -785,12 +785,12 @@ SvMetaType::SvMetaType( const rtl::OString& rName,
     CTOR
 {
     SetName( rName );
-    aSbxName    = rSbxName;
-    aOdlName    = rOdlName;
+    aSbxName.setIdentifier(rSbxName);
+    aOdlName.setIdentifier(rOdlName);
     cParserChar = cPc;
-    aCName      = rCName;
-    aBasicName  = rBasicName;
-    aBasicPostfix = rBasicPostfix;
+    aCName.setIdentifier(rCName);
+    aBasicName.setIdentifier(rBasicName);
+    aBasicPostfix.setIdentifier(rBasicPostfix);
 }
 
 void SvMetaType::Load( SvPersistStream & rStm )
@@ -875,12 +875,13 @@ void SvMetaType::SetType( int nT )
     nType = nT;
     if( nType == TYPE_ENUM )
     {
-        aOdlName = "short";
+        aOdlName.setIdentifier("short");
     }
     else if( nType == TYPE_CLASS )
     {
-        aCName = C_PREF;
-        aCName += "Object *";
+        ByteString aTmp(C_PREF);
+        aTmp += "Object *";
+        aCName.setIdentifier(aTmp);
     }
 }
 
@@ -901,7 +902,7 @@ SvMetaType * SvMetaType::GetReturnType() const
 const ByteString& SvMetaType::GetBasicName() const
 {
     if( aBasicName.IsSet() || !GetRef() )
-        return aBasicName;
+        return aBasicName.getIdentifier();
     else
         return ((SvMetaType*)GetRef())->GetBasicName();
 }
@@ -988,7 +989,7 @@ int SvMetaType::GetCall1() const
 const ByteString & SvMetaType::GetSvName() const
 {
     if( aSvName.IsSet() || !GetRef() )
-        return aSvName;
+        return aSvName.getIdentifier();
     else
         return ((SvMetaType *)GetRef())->GetSvName();
 }
@@ -996,7 +997,7 @@ const ByteString & SvMetaType::GetSvName() const
 const ByteString & SvMetaType::GetSbxName() const
 {
     if( aSbxName.IsSet() || !GetRef() )
-        return aSbxName;
+        return aSbxName.getIdentifier();
     else
         return ((SvMetaType *)GetRef())->GetSbxName();
 }
@@ -1004,7 +1005,7 @@ const ByteString & SvMetaType::GetSbxName() const
 const ByteString & SvMetaType::GetOdlName() const
 {
     if( aOdlName.IsSet() || !GetRef() )
-        return aOdlName;
+        return aOdlName.getIdentifier();
     else
         return ((SvMetaType *)GetRef())->GetOdlName();
 }
@@ -1012,18 +1013,18 @@ const ByteString & SvMetaType::GetOdlName() const
 const ByteString & SvMetaType::GetCName() const
 {
     if( aCName.IsSet() || !GetRef() )
-        return aCName;
+        return aCName.getIdentifier();
     else
         return ((SvMetaType *)GetRef())->GetCName();
 }
 
 sal_Bool SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
 {
-    aSvName     = rName;
-    aSbxName    = rName;
-    aCName      = rName;
+    aSvName.setIdentifier(rName);
+    aSbxName.setIdentifier(rName);
+    aCName.setIdentifier(rName);
     if( GetType() != TYPE_ENUM )
-        aOdlName = rName;
+        aOdlName.setIdentifier(rName);
     return SvMetaReference::SetName( rName, pBase );
 }
 
@@ -1327,23 +1328,23 @@ void SvMetaType::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 {
     SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
     ByteString name = GetName();
-    if( aSvName != name || aSbxName != name || aOdlName != name )
+    if( aSvName.getIdentifier() != name || aSbxName.getIdentifier() != name || aOdlName.getIdentifier() != name )
     {
         WriteTab( rOutStm, nTab );
         rOutStm << "class SvMetaType" << endl;
-        if( aSvName != name )
+        if( aSvName.getIdentifier() != name )
         {
             WriteTab( rOutStm, nTab );
             aSvName.WriteSvIdl( SvHash_SvName(), rOutStm, nTab );
             rOutStm << endl;
         }
-        if( aSbxName != name )
+        if( aSbxName.getIdentifier() != name )
         {
             WriteTab( rOutStm, nTab );
             aSbxName.WriteSvIdl( SvHash_SbxName(), rOutStm, nTab );
             rOutStm << endl;
         }
-        if( aOdlName != name )
+        if( aOdlName.getIdentifier() != name )
         {
             WriteTab( rOutStm, nTab );
             aOdlName.WriteSvIdl( SvHash_OdlName(), rOutStm, nTab );
@@ -2030,7 +2031,7 @@ void SvMetaAttribute::WriteCSV( SvIdlDataBase&, SvStream& rStrm )
 {
     rStrm << GetType()->GetSvName().GetBuffer() << ' ';
     rStrm << GetName().GetBuffer() << ' ';
-    rStrm << GetSlotId().GetBuffer();
+    rStrm << GetSlotId().getIdentifier().GetBuffer();
 }
 
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index a7df034958d9..d3882cff557c 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -485,7 +485,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
                 for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
                 {
                     SvMetaAttribute * pAttr = aAttrList.GetObject( i );
-                    if( pAttr->GetSlotId() == pTok->GetString() )
+                    if( pAttr->GetSlotId().getIdentifier() == pTok->GetString() )
                         return pAttr;
                 }
             }
@@ -506,12 +506,12 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr
 )
 {
     sal_uLong n;
-    if( FindId( rId, &n ) )
+    if( FindId( rId.getIdentifier(), &n ) )
     {
         for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
         {
             SvMetaAttribute * pAttr = aAttrList.GetObject( i );
-            if( pAttr->GetSlotId() == rId )
+            if( pAttr->GetSlotId().getIdentifier() == rId.getIdentifier() )
                 return pAttr;
         }
     }