3 files changed, 9 insertions, 7 deletions
diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx
index 1440b63897b6..f388b4d8d273 100644
--- a/sw/source/core/inc/DocumentDeviceManager.hxx
+++ b/sw/source/core/inc/DocumentDeviceManager.hxx
@@ -22,7 +22,7 @@
 #include <IDocumentDeviceAccess.hxx>
 #include <boost/utility.hpp>
 #include <sal/types.h>
-
+#include <vcl/vclptr.hxx>
 
 class SwDoc;
 class SfxPrinter;
@@ -72,8 +72,8 @@ private:
                                 invalidations and notifications. */
 
     SwDoc& m_rDoc;
-    SfxPrinter* mpPrt;
-    VirtualDevice* mpVirDev;
+    VclPtr<SfxPrinter> mpPrt;
+    VclPtr<VirtualDevice> mpVirDev;
     SwPrintData* mpPrtData;
 };
 
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index fee34b12737e..a601ce4aa20c 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -22,9 +22,10 @@
 
 #include <tools/solar.h>
 #include <osl/diagnose.h>
+#include <vcl/vclptr.hxx>
+#include <vcl/outdev.hxx>
 
 class SwTxtFrm;
-class OutputDevice;
 class SwViewShell;
 class SwScriptInfo;
 class Point;
@@ -41,7 +42,7 @@ class SwUnderlineFont;
 class SwDrawTextInfo
 {
     const SwTxtFrm* pFrm;
-    OutputDevice* pOut;
+    VclPtr<OutputDevice> pOut;
     SwViewShell const * pSh;
     const SwScriptInfo* pScriptInfo;
     Point m_aPos;
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index dfc4c7c2aa34..6755965d0f91 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_FNTCACHE_HXX
 
 #include <vcl/font.hxx>
+#include <vcl/vclptr.hxx>
 #include <tools/mempool.hxx>
 #include "swtypes.hxx"
 #include "swcache.hxx"
@@ -63,7 +64,7 @@ class SwFntObj : public SwCacheObj
     vcl::Font aFont;
     vcl::Font *pScrFont;
     vcl::Font *pPrtFont;
-    OutputDevice* pPrinter;
+    VclPtr<OutputDevice> pPrinter;
     sal_uInt16 nGuessedLeading;
     sal_uInt16 nExtLeading;
     sal_uInt16 nScrAscent;
@@ -77,7 +78,7 @@ class SwFntObj : public SwCacheObj
 
     static long nPixWidth;
     static MapMode *pPixMap;
-    static OutputDevice *pPixOut;
+    static VclPtr<OutputDevice> pPixOut;
 
     void calcLinePos(SwDrawTextInfo& rInf, Point& aStart, Point& aEnd, sal_Int32 nStart,
        sal_Int32 nWrLen, sal_Int32 nCnt, const bool bSwitchH2V, const bool bSwitchL2R,