Replace SV_DECL/IMPL_REF macros with SvRef template

Change-Id: I0ef2e67f6d61e0ce118c0f5e926b8194ef9d8058

8 files changed, 12 insertions, 22 deletions

diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index d38e652e1e1a..5ca27f676b94 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -67,7 +67,7 @@ public:
     virtual void    Broadcast( sal_uIntPtr nHintId ) SAL_OVERRIDE;
 };
 
-SV_DECL_IMPL_REF(SbMethod)
+typedef tools::SvRef<SbMethod> SbMethodRef;
 
 class BASIC_DLLPUBLIC SbIfaceMapperMethod : public SbMethod
 {
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index c5acf1594b0c..c65f05588ba7 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -139,7 +139,7 @@ public:
     OUString GetKeywordCase( const OUString& sKeyword ) const;
 };
 
-SV_DECL_IMPL_REF(SbModule)
+typedef tools::SvRef<SbModule> SbModuleRef;
 
 // Object class for instances of class modules
 class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 5078c200d1f7..2eec72bae613 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -176,7 +176,7 @@ public:
         GetModelFromBasic( SbxObject* pBasic );
 };
 
-SV_DECL_IMPL_REF(StarBASIC)
+typedef tools::SvRef<StarBASIC> StarBASICRef;
 
 #endif
 
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index a904bf3e6d25..1ab7ed3deabc 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -116,7 +116,6 @@ public:
 // declared datatype, if they are not SbxVARIANT.
 
 class SbxVarRefs;
-class SbxVariableRef;
 
 class BASIC_DLLPUBLIC SbxArray : public SbxBase
 {
@@ -256,24 +255,17 @@ public:
     const OUString& GetElementClass() const { return aElemClass; }
 };
 
-SV_IMPL_REF(SbxBase)
-
-SV_IMPL_REF(SbxVariable)
-
 #ifndef SBX_ARRAY_DECL_DEFINED
 #define SBX_ARRAY_DECL_DEFINED
-SV_DECL_REF(SbxArray)
+typedef tools::SvRef<SbxArray> SbxArrayRef;
 #endif
-SV_IMPL_REF(SbxArray)
 
 #ifndef SBX_INFO_DECL_DEFINED
 #define SBX_INFO_DECL_DEFINED
-SV_DECL_REF(SbxInfo)
+typedef tools::SvRef<SbxInfo> SbxInfoRef;
 #endif
-SV_IMPL_REF(SbxInfo)
 
-SV_DECL_REF(SbxDimArray)
-SV_IMPL_REF(SbxDimArray)
+typedef tools::SvRef<SbxDimArray> SbxDimArrayRef;
 
 #endif
 
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 5bf2b2ec61db..079b9618f529 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -106,7 +106,7 @@ public:
     static SbxObject* CreateObject( const OUString& );
 };
 
-SV_DECL_REF(SbxBase)
+typedef tools::SvRef<SbxBase> SbxBaseRef;
 
 inline void SbxBase::SetFlags( sal_uInt16 n )
 { nFlags = n; }
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index 586af9f4ff32..c6c09cf5ffe8 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -88,8 +88,7 @@ public:
     void Dump( SvStream&, bool bDumpAll=false );
 };
 
-SV_DECL_REF(SbxObject)
-SV_IMPL_REF(SbxObject)
+typedef tools::SvRef<SbxObject> SbxObjectRef;
 
 #endif // INCLUDED_BASIC_SBXOBJ_HXX
 
diff --git a/include/basic/sbxprop.hxx b/include/basic/sbxprop.hxx
index 3a9cd23c2545..6587b7f64759 100644
--- a/include/basic/sbxprop.hxx
+++ b/include/basic/sbxprop.hxx
@@ -36,8 +36,7 @@ public:
     virtual SbxClassType GetClass() const SAL_OVERRIDE;
 };
 
-SV_DECL_REF(SbxProperty)
-SV_IMPL_REF(SbxProperty)
+typedef tools::SvRef<SbxProperty> SbxPropertyRef;
 
 #endif
 
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 789cec6cd55d..1204df24546e 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -270,12 +270,12 @@ class SbxInfo;
 
 #ifndef SBX_ARRAY_DECL_DEFINED
 #define SBX_ARRAY_DECL_DEFINED
-SV_DECL_REF(SbxArray)
+typedef tools::SvRef<SbxArray> SbxArrayRef;
 #endif
 
 #ifndef SBX_INFO_DECL_DEFINED
 #define SBX_INFO_DECL_DEFINED
-SV_DECL_REF(SbxInfo)
+typedef tools::SvRef<SbxInfo> SbxInfoRef;
 #endif
 
 class SfxBroadcaster;
@@ -349,7 +349,7 @@ public:
     static sal_uInt16 MakeHashCode( const OUString& rName );
 };
 
-SV_DECL_REF(SbxVariable)
+typedef tools::SvRef<SbxVariable> SbxVariableRef;
 
 #endif // INCLUDED_BASIC_SBXVAR_HXX