From 2886f830a9c7871974f9afbc1fdc46bbae468811 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 3 Aug 2015 15:12:26 +0200
Subject: idl,framework,forms: inline some use-once typedefs

Change-Id: Icb4908c274ec0778af7ed9fe2d935bf6723fedfb
---
 idl/inc/basobj.hxx            | 4 +---
 idl/inc/module.hxx            | 1 -
 idl/inc/object.hxx            | 2 --
 idl/inc/types.hxx             | 2 --
 idl/source/objects/module.cxx | 2 +-
 idl/source/objects/object.cxx | 2 +-
 idl/source/objects/types.cxx  | 2 +-
 idl/source/prj/database.cxx   | 2 +-
 8 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'idl')

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 81194182db3c..89ca0a61b56b 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -100,12 +100,10 @@ public:
 
 class SvMetaNameMemberList : public SvRefMemberList<SvMetaName *> {};
 
-class SvMetaReference;
-typedef tools::SvRef<SvMetaReference> SvMetaReferenceRef;
 class SvMetaReference : public SvMetaName
 {
 protected:
-    SvMetaReferenceRef  aRef;
+    tools::SvRef<SvMetaReference>  aRef;
 public:
             TYPEINFO_OVERRIDE();
             SvMetaReference();
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 4cb379882196..46cacb854a20 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -65,7 +65,6 @@ public:
 
     void                WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
 };
-typedef tools::SvRef<SvMetaModule> SvMetaModuleRef;
 
 class SvMetaModuleMemberList : public SvRefMemberList<SvMetaModule *> {};
 
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 37788d372ad1..7d3e07b39fc6 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -62,8 +62,6 @@ public:
                     { return xClass; }
 };
 
-typedef tools::SvRef<SvClassElement> SvClassElementRef;
-
 class SvClassElementMemberList : public SvRefMemberList<SvClassElement *> {};
 
 class SvMetaClassMemberList : public SvRefMemberList<SvMetaClass *> {};
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 79b976d5d4b1..a9d5c75030c9 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -190,7 +190,6 @@ public:
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
 };
-typedef tools::SvRef<SvMetaEnumValue> SvMetaEnumValueRef;
 
 class SvMetaEnumValueMemberList : public SvRefMemberList<SvMetaEnumValue *> {};
 
@@ -211,7 +210,6 @@ public:
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
 };
-typedef tools::SvRef<SvMetaTypeEnum> SvMetaTypeEnumRef;
 
 class SvMetaTypeEnumMemberList : public SvRefMemberList<SvMetaTypeEnum *> {};
 
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 573fc6ddac27..c6e29449d8a1 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -97,7 +97,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
     }
     else if( rInStm.GetToken().Is( SvHash_enum() ) )
     {
-        SvMetaTypeEnumRef aEnum = new SvMetaTypeEnum();
+        tools::SvRef<SvMetaTypeEnum> aEnum = new SvMetaTypeEnum();
 
         if( aEnum->ReadSvIdl( rBase, rInStm ) )
         {
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index fe9117da1979..1ce4378edab6 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -58,7 +58,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
         SvMetaClass * pClass = rBase.ReadKnownClass( rInStm );
         if( pClass )
         {
-            SvClassElementRef xEle = new SvClassElement();
+            tools::SvRef<SvClassElement> xEle = new SvClassElement();
             xEle->SetClass( pClass );
             aClassList.push_back( xEle );
 
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 95a04f0e50e9..e87ea42e6fce 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -704,7 +704,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
 {
     sal_uInt32 nTokPos = rInStm.Tell();
 
-    SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue();
+    tools::SvRef<SvMetaEnumValue> aEnumVal = new SvMetaEnumValue();
     bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
     if( bOk )
     {
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 6030afd9e5ce..51f906c3a23e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -587,7 +587,7 @@ bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, bool bImported, const
         // only one import at the very beginning
         if( pTok->Is( SvHash_module() ) )
         {
-            SvMetaModuleRef aModule = new SvMetaModule( bImported );
+            tools::SvRef<SvMetaModule> aModule = new SvMetaModule( bImported );
             if( aModule->ReadSvIdl( *this, rInStm ) )
                 GetModuleList().push_back( aModule );
             else
-- 
cgit