Replace SV_DECL/IMPL_REF macros with SvRef template

Change-Id: I0ef2e67f6d61e0ce118c0f5e926b8194ef9d8058

4 files changed, 4 insertions, 6 deletions

diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 8eaffadff9f8..f5c5bb65cea5 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -21,6 +21,7 @@
 #define SC_CHARTUNO_HXX
 
 #include "address.hxx"
+#include "rangelst.hxx"
 #include <svl/lstner.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
@@ -37,7 +38,6 @@
 
 
 class ScDocShell;
-class ScRangeListRef;
 class ScChartObj;
 
 
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 0c3f0ec1a8e6..6764d0353ca2 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -44,7 +44,6 @@
 
 class ScDocument;
 class ScTokenArray;
-class SfxObjectShellRef;
 class Window;
 class ScFormulaCell;
 
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 0d94fb33539a..d950d3439b28 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -433,7 +433,6 @@ struct ScImportParam
 
 class ScDocument;
 class ScDocShell;
-class ScDocShellRef;
 class SvxSearchItem;
 class ScAutoFormat;
 class FuncCollection;
@@ -550,7 +549,7 @@ public:
     SC_DLLPUBLIC static double              nScreenPPTX;
     SC_DLLPUBLIC static double              nScreenPPTY;
 
-    static ScDocShellRef*   pDrawClipDocShellRef;
+    static tools::SvRef<ScDocShell>*   pDrawClipDocShellRef;
 
     static sal_uInt16           nDefFontHeight;
     SC_DLLPUBLIC static sal_uInt16           nStdRowHeight;
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 2505e147aa01..4a35b91e59b2 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -96,7 +96,7 @@ private:
     typedef std::vector<ScRange*>::iterator iterator;
     typedef std::vector<ScRange*>::const_iterator const_iterator;
 };
-SV_DECL_IMPL_REF( ScRangeList );
+typedef tools::SvRef<ScRangeList> ScRangeListRef;
 
 
 // RangePairList:
@@ -132,7 +132,7 @@ public:
 private:
     ::std::vector< ScRangePair* > maPairs;
 };
-SV_DECL_IMPL_REF( ScRangePairList );
+typedef tools::SvRef<ScRangePairList> ScRangePairListRef;
 
 extern "C"
 int SAL_CALL ScRangePairList_QsortNameCompare( const void*, const void* );