Replace SV_DECL/IMPL_REF macros with SvRef template

Change-Id: I0ef2e67f6d61e0ce118c0f5e926b8194ef9d8058

10 files changed, 11 insertions, 18 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* );
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index f982f97f2c20..bb715d6eff72 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -12,6 +12,7 @@
 
 #include "scdllapi.h"
 #include "debughelper.hxx"
+#include "docsh.hxx"
 #include "address.hxx"
 
 #include <test/bootstrapfixture.hxx>
@@ -169,9 +170,6 @@ struct assertion_traits<ScRange>
 
 }
 
-class ScDocShellRef;
-class ScDocShell;
-
 class SCQAHELPER_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture
 {
 protected:
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index fb2a5781005d..b1f833aeea92 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -81,7 +81,7 @@
 #include "editutil.hxx"
 
 
-ScDocShellRef*  ScGlobal::pDrawClipDocShellRef = NULL;
+tools::SvRef<ScDocShell>*  ScGlobal::pDrawClipDocShellRef = NULL;
 SvxSearchItem*  ScGlobal::pSearchItem = NULL;
 ScAutoFormat*   ScGlobal::pAutoFormat = NULL;
 FuncCollection* ScGlobal::pFuncCollection = NULL;
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 40431c2728f7..e2008b10c936 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -24,6 +24,7 @@
 #include <map>
 #include <limits>
 #include <sal/macros.h>
+#include <sot/storage.hxx>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <oox/helper/helper.hxx>
@@ -123,8 +124,6 @@ class SfxPoolItem;
 class SfxItemSet;
 class ScStyleSheet;
 class ScStyleSheetPool;
-class SotStorageRef;
-class SotStorageStreamRef;
 class SvStream;
 
 /** Contains static methods used anywhere in the filters. */
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index ac564f552618..14eef005c269 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -105,7 +105,7 @@ public:
     void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc);
     void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport);
 };
-SV_DECL_IMPL_REF( ScMyStyleRanges );
+typedef tools::SvRef<ScMyStyleRanges> ScMyStyleRangesRef;
 
 struct ScMyStyle
 {
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 623a507ad432..60c2657b1ce4 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -439,10 +439,8 @@ public:
 
 void UpdateAcceptChangesDialog();
 
-
-SV_DECL_REF(ScDocShell)
-SV_IMPL_REF(ScDocShell)
-
+class ScDocShell;
+typedef tools::SvRef<ScDocShell> ScDocShellRef;
 
 /** Create before modifications of the document and destroy thereafter.
     Call SetDocumentModified() at an instance of this class instead of at
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 0ec932d6b602..bc091add0f44 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -20,6 +20,7 @@
 #define SC_VIEWDATA_HXX
 
 #include <sfx2/zoomitem.hxx>
+#include "rangelst.hxx"
 #include "scdllapi.h"
 #include "viewopti.hxx"
 
@@ -97,7 +98,6 @@ class SfxObjectShell;
 class SfxBindings;
 class SfxDispatcher;
 class ScPatternAttr;
-class ScRangeListRef;
 class ScExtDocOptions;
 class ScViewData;
 class ScMarkData;