6 files changed, 6 insertions, 11 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;