Replace SV_DECL/IMPL_REF macros with SvRef template

Change-Id: I0ef2e67f6d61e0ce118c0f5e926b8194ef9d8058

22 files changed, 14 insertions, 36 deletions

diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index ba2b0f4fb78f..7a03295a13b4 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -27,11 +27,6 @@
 #include <map>
 #include "swdll.hxx"
 
-#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
-#define SW_DECL_SWSERVEROBJECT_DEFINED
-SV_DECL_REF( SwServerObject )
-#endif
-
 struct SwPosition;
 
 namespace sw { namespace mark
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 21df9cdafbd5..f42b0c8c451a 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -43,7 +43,8 @@ class SwTOXBase;
 
 #ifndef SW_DECL_SWSERVEROBJECT_DEFINED
 #define SW_DECL_SWSERVEROBJECT_DEFINED
-SV_DECL_REF( SwServerObject )
+class SwServerObject;
+typedef tools::SvRef<SwServerObject> SwServerObjectRef;
 #endif
 
 typedef std::vector<SwSection*> SwSections;
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index c28fb75f037a..bdb3aeaf5099 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -464,9 +464,8 @@ public:
 
 #ifndef SW_DECL_WRITER_DEFINED
 #define SW_DECL_WRITER_DEFINED
-SV_DECL_REF(Writer)
+typedef tools::SvRef<Writer> WriterRef;
 #endif
-SV_IMPL_REF(Writer)
 
 // Base class for all storage writers.
 class SW_DLLPUBLIC StgWriter : public Writer
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 606dc10d2852..6ae30996e68f 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -78,7 +78,7 @@ public:
 
 #ifndef SW_DECL_SWSERVEROBJECT_DEFINED
 #define SW_DECL_SWSERVEROBJECT_DEFINED
-SV_DECL_REF( SwServerObject )
+typedef tools::SvRef<SwServerObject> SwServerObjectRef;
 #endif
 
 #endif // INCLUDED_SW_INC_SWSERV_HXX
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index e003e2ffbe38..c98cc0c666eb 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -61,7 +61,8 @@ struct Parm;
 
 #ifndef SW_DECL_SWSERVEROBJECT_DEFINED
 #define SW_DECL_SWSERVEROBJECT_DEFINED
-SV_DECL_REF( SwServerObject )
+class SwServerObject;
+typedef tools::SvRef<SwServerObject> SwServerObjectRef;
 #endif
 
 class SwTableLines : public std::vector<SwTableLine*> {
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 9cd7d14783a9..22a4ff8528f3 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -34,7 +34,6 @@
 namespace com { namespace sun { namespace star { namespace accessibility {
            class XAccessible; } } } }
 
-class SfxObjectShellRef;
 class SwDoc;
 class IDocumentSettingAccess;
 class IDocumentDeviceAccess;
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index ca05576738c8..3cbad56dec20 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -31,8 +31,7 @@
 #include "shellres.hxx"
 #include "docufld.hxx"
 
-SV_DECL_REF(SwDocShell)
-SV_IMPL_REF(SwDocShell)
+typedef tools::SvRef<SwDocShell> SwDocShellRef;
 
 using namespace ::com::sun::star;
 
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index d21fb9e16e35..221f681a12be 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -39,8 +39,7 @@
 #include <doc.hxx>
 #include "docsh.hxx"
 
-SV_DECL_REF(SwDocShell)
-SV_IMPL_REF(SwDocShell)
+typedef tools::SvRef<SwDocShell> SwDocShellRef;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index b32e8241bbf6..b6d8dee0bdaf 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -52,8 +52,7 @@
 #include "modeltoviewhelper.hxx"
 #include "scriptinfo.hxx"
 
-SV_DECL_REF(SwDocShell)
-SV_IMPL_REF(SwDocShell)
+typedef tools::SvRef<SwDocShell> SwDocShellRef;
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 1fb0b051732e..5bd6dc9b404d 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -31,8 +31,6 @@
 #include <rtl/random.h>
 #include <xmloff/odffields.hxx>
 
-SV_IMPL_REF( SwServerObject )
-
 using namespace ::sw::mark;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index e8c83b7c0e43..7d5e534cbc4e 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -33,8 +33,6 @@
 
 using namespace ::com::sun::star;
 
-SV_IMPL_REF( SwServerObject )
-
 SwServerObject::~SwServerObject()
 {
 }
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index e57287a3ff52..5895eb478a0a 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -60,8 +60,6 @@
 
 using namespace ::com::sun::star;
 
-SV_IMPL_REF( SwServerObject )
-
 class SwIntrnlSectRefLink : public SwBaseLink
 {
     SwSectionFmt& rSectFmt;
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 633ef6153c19..d451b927667d 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -55,8 +55,6 @@ static bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pG
 
 TYPEINIT1( SwBaseLink, ::sfx2::SvBaseLink );
 
-SV_IMPL_REF( SwServerObject )
-
 static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 {
     //call fist all not SwNoTxtFrames, then the SwNoTxtFrames.
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 3184a10ada16..dc5cb5d97d1a 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -27,6 +27,7 @@
 #include <map>
 #include <rtl/ustring.hxx>
 #include <IMark.hxx>
+#include <swserv.hxx>
 
 namespace com {
     namespace sun {
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index a55b9a5eadd9..19f1c6110c2d 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -72,8 +72,6 @@ TYPEINIT1( SwTableFmt, SwFrmFmt );
 TYPEINIT1( SwTableBoxFmt, SwFrmFmt );
 TYPEINIT1( SwTableLineFmt, SwFrmFmt );
 
-SV_IMPL_REF( SwServerObject )
-
 #define COLFUZZY 20
 
 void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
diff --git a/sw/source/core/uibase/dochdl/gloshdl.cxx b/sw/source/core/uibase/dochdl/gloshdl.cxx
index e2cb03c15898..172a24f8dcb4 100644
--- a/sw/source/core/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/core/uibase/dochdl/gloshdl.cxx
@@ -70,7 +70,6 @@ struct TextBlockInfo_Impl
     OUString sGroupName;
 };
 typedef boost::ptr_vector<TextBlockInfo_Impl> TextBlockInfoArr;
-SV_IMPL_REF( SwDocShell )
 
 // Dialog for edit templates
 void SwGlossaryHdl::GlossaryDlg()
diff --git a/sw/source/core/uibase/inc/glosdoc.hxx b/sw/source/core/uibase/inc/glosdoc.hxx
index a5213b1179a1..4c2e63379199 100644
--- a/sw/source/core/uibase/inc/glosdoc.hxx
+++ b/sw/source/core/uibase/inc/glosdoc.hxx
@@ -28,7 +28,7 @@ class SwDocShell;
 #ifndef SW_DECL_SWDOCSHELL_DEFINED
 #define SW_DECL_SWDOCSHELL_DEFINED
 #include <tools/ref.hxx>
-SV_DECL_REF( SwDocShell )
+typedef tools::SvRef<SwDocShell> SwDocShellRef;
 #endif
 #include <cppuhelper/weakref.hxx>
 
diff --git a/sw/source/core/uibase/inc/unoatxt.hxx b/sw/source/core/uibase/inc/unoatxt.hxx
index 1e65f7a0fa52..d3871bfa51aa 100644
--- a/sw/source/core/uibase/inc/unoatxt.hxx
+++ b/sw/source/core/uibase/inc/unoatxt.hxx
@@ -44,7 +44,7 @@ class SwXBodyText;
 #ifndef SW_DECL_SWDOCSHELL_DEFINED
 #define SW_DECL_SWDOCSHELL_DEFINED
 #include <tools/ref.hxx>
-SV_DECL_REF( SwDocShell )
+typedef tools::SvRef<SwDocShell> SwDocShellRef;
 #endif
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/sw/source/core/uibase/misc/glshell.cxx b/sw/source/core/uibase/misc/glshell.cxx
index dc26db2958c4..e78ca093bc85 100644
--- a/sw/source/core/uibase/misc/glshell.cxx
+++ b/sw/source/core/uibase/misc/glshell.cxx
@@ -194,8 +194,6 @@ bool SwWebGlosDocShell::Save()
     }
 }
 
-SV_IMPL_REF ( SwDocShell )
-
 SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString& rShortName, sal_Bool bShow )
 {
     SwDocShellRef xDocSh;
diff --git a/sw/source/core/uibase/uno/unoatxt.cxx b/sw/source/core/uibase/uno/unoatxt.cxx
index 5d5ebbd46d66..54e9c493b0b0 100644
--- a/sw/source/core/uibase/uno/unoatxt.cxx
+++ b/sw/source/core/uibase/uno/unoatxt.cxx
@@ -51,7 +51,6 @@
 
 #include <boost/scoped_ptr.hpp>
 
-SV_IMPL_REF ( SwDocShell )
 using namespace ::com::sun::star;
 
 uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance(
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 82598759628b..d607c8c4e3d8 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WRTWW8_HXX
 #define INCLUDED_SW_SOURCE_FILTER_WW8_WRTWW8_HXX
 
+#include <sot/storage.hxx>
 #include <tools/solar.h>
 #include <tools/gen.hxx>
 #include <editeng/editdata.hxx>
@@ -115,7 +116,6 @@ namespace com { namespace sun { namespace star { namespace embed {
 class XEmbeddedObject;
 } } } }
 typedef std::map<const com::sun::star::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
-class SvStorageRef;
 struct WW8_PdAttrDesc;
 class SvxBrushItem;
 
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index 031853f0a7a4..23fda32c2b23 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -74,8 +74,7 @@ public:
     sal_uInt16 getCount() const;
 };
 
-SV_DECL_REF( SvXMLItemMapEntries )
-SV_IMPL_REF( SvXMLItemMapEntries )
+typedef tools::SvRef<SvXMLItemMapEntries> SvXMLItemMapEntriesRef;
 
 #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITMAP_HXX