loplugin:mergeclasses SvIdentifier

Change-Id: If3b6ce64c7ad2cda1f992cfb10618fa7d7946fba

5 files changed, 6 insertions, 6 deletions

diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index ca84295c8eab..c2cc6c5c11ac 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -175,7 +175,7 @@ bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
     return false;
 }
 
-bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+bool SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
                                     SvStringHashEntry * pName,
                                     SvTokenStream & rInStm )
 {
@@ -198,7 +198,7 @@ bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
     return false;
 }
 
-bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+bool SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
                                     SvTokenStream & rInStm )
 {
     sal_uInt32 nTokPos = rInStm.Tell();
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 1ce4378edab6..38985042df2a 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -133,7 +133,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
         {
             if( !xAttr->GetSlotId().IsSet() )
             {
-                SvNumberIdentifier aI;
+                SvIdentifier aI;
                 aI.SetValue( rBase.GetUniqueId() );
                 xAttr->SetSlotId( aI );
             }
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 8b1a2e1533d3..00054c26e8aa 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -595,7 +595,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
                 sal_uLong nValue;
                 if ( rBase.FindId(aSId , &nValue) )
                 {
-                    SvNumberIdentifier aId;
+                    SvIdentifier aId;
                     aId.setString(aSId);
                     aId.SetValue(nValue);
                     xEnumSlot->SetSlotId(aId);
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index e87ea42e6fce..49549c14f291 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -55,7 +55,7 @@ SvMetaType * SvMetaAttribute::GetType() const
     return static_cast<SvMetaAttribute *>(GetRef())->GetType();
 }
 
-const SvNumberIdentifier & SvMetaAttribute::GetSlotId() const
+const SvIdentifier & SvMetaAttribute::GetSlotId() const
 {
     if( aSlotId.IsSet() || !GetRef() ) return aSlotId;
     return static_cast<SvMetaAttribute *>(GetRef())->GetSlotId();
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 51f906c3a23e..80b533d4339f 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -417,7 +417,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
 
 SvMetaAttribute* SvIdlDataBase::SearchKnownAttr
 (
-    const SvNumberIdentifier& rId
+    const SvIdentifier& rId
 )
 {
     sal_uLong n;