.SDI compiler: expand out some typedefs

Change-Id: I898bc1d95b1d3394cae74776c0e7dcbaafa934e4
Reviewed-on: https://gerrit.libreoffice.org/22146
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 11 insertions, 11 deletions

diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 57660403a690..470f768ef8d9 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -71,7 +71,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
     if( rInStm.GetToken().Is( SvHash_interface() )
       || rInStm.GetToken().Is( SvHash_shell() ) )
     {
-        SvMetaClassRef aClass = new SvMetaClass();
+        tools::SvRef<SvMetaClass> aClass( new SvMetaClass() );
         if( aClass->ReadSvIdl( rBase, rInStm ) )
         {
             aClassList.push_back( aClass );
@@ -81,7 +81,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
     }
     else if( rInStm.GetToken().Is( SvHash_enum() ) )
     {
-        tools::SvRef<SvMetaTypeEnum> aEnum = new SvMetaTypeEnum();
+        tools::SvRef<SvMetaTypeEnum> aEnum( new SvMetaTypeEnum() );
 
         if( aEnum->ReadSvIdl( rBase, rInStm ) )
         {
@@ -94,7 +94,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
     else if( rInStm.GetToken().Is( SvHash_item() )
       || rInStm.GetToken().Is( SvHash_struct() ) )
     {
-        SvMetaTypeRef xItem = new SvMetaType();
+        tools::SvRef<SvMetaType> xItem(new SvMetaType() );
 
         if( xItem->ReadSvIdl( rBase, rInStm ) )
         {
@@ -162,7 +162,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
     }
     else
     {
-        SvMetaSlotRef xSlot = new SvMetaSlot();
+        tools::SvRef<SvMetaSlot> xSlot( new SvMetaSlot() );
 
         if( xSlot->ReadSvIdl( rBase, rInStm ) )
         {
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index d8d633aaa9a3..d4d8002e6b7e 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -81,7 +81,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
         SvMetaType * pType = rBase.ReadKnownType( rInStm );
 
         bool bOk = false;
-        SvMetaAttributeRef xAttr;
+        tools::SvRef<SvMetaAttribute> xAttr;
         if( !pType || pType->IsItem() )
         {
             xAttr = new SvMetaSlot( pType );
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 805a37d4215f..ad1111142a52 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -469,7 +469,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
     if( GetPseudoSlots() && pEnum && pEnum->Count() )
     {
         // clone the MasterSlot
-        SvMetaSlotRef xEnumSlot;
+        tools::SvRef<SvMetaSlot> xEnumSlot;
         SvMetaSlot *pFirstEnumSlot = nullptr;
         for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
@@ -871,7 +871,7 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
         if( !SvIdlDataBase::FindType( pType, rBase.aUsedTypes ) )
             rBase.aUsedTypes.push_back( pType );
 
-        const SvMetaAttributeMemberList & rList =
+        const SvRefMemberList<SvMetaAttribute *>& rList =
                     pType->GetAttrList();
         for( sal_uLong n = 0; n < rList.size(); n++ )
         {
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index b5d1c154e48f..4ebfcc371a2d 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -127,7 +127,7 @@ bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
         SvToken& rTok  = rInStm.GetToken();
         if( bOk && rTok.IsChar() && rTok.GetChar() == '(' )
         {
-            SvMetaTypeRef xT = new SvMetaType();
+            tools::SvRef<SvMetaType> xT(new SvMetaType() );
             xT->SetRef( GetType() );
             aType = xT;
             bOk = aType->ReadMethodArgs( rBase, rInStm );
@@ -221,10 +221,10 @@ SvMetaType::~SvMetaType() {
     delete pAttrList;
 }
 
-SvMetaAttributeMemberList & SvMetaType::GetAttrList() const
+SvRefMemberList<SvMetaAttribute *>& SvMetaType::GetAttrList() const
 {
     if( !pAttrList )
-        const_cast<SvMetaType *>(this)->pAttrList = new SvMetaAttributeMemberList();
+        const_cast<SvMetaType *>(this)->pAttrList = new SvRefMemberList<SvMetaAttribute *>();
     return *pAttrList;
 }
 
@@ -414,7 +414,7 @@ bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
 void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm )
 {
-    SvMetaAttributeRef xAttr = new SvMetaAttribute();
+    tools::SvRef<SvMetaAttribute> xAttr( new SvMetaAttribute() );
     if( xAttr->ReadSvIdl( rBase, rInStm ) )
     {
         if( xAttr->Test( rBase, rInStm ) )