Convert last vestiges of OutputDevice* and VirtualDevice* members.

Change-Id: I2353d8e9f2b30bf00cf5229613793d9605854b76

28 files changed, 34 insertions, 32 deletions

diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
index bb455c3cc916..08669ba8eb27 100644
--- a/canvas/source/directx/dx_devicehelper.hxx
+++ b/canvas/source/directx/dx_devicehelper.hxx
@@ -105,7 +105,7 @@ namespace dxcanvas
          */
         com::sun::star::rendering::XGraphicDevice* mpDevice;
         HDC                                        mnHDC;
-        OutputDevice* mpOutDev;
+        VclPtr<OutputDevice> mpOutDev;
     };
 
     typedef ::rtl::Reference< com::sun::star::rendering::XGraphicDevice > DeviceRef;
diff --git a/include/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx
index d928a84a5d35..fb10ad339e0b 100644
--- a/include/drawinglayer/processor2d/canvasprocessor.hxx
+++ b/include/drawinglayer/processor2d/canvasprocessor.hxx
@@ -71,7 +71,7 @@ namespace drawinglayer
         {
         private:
             // the (current) destination OutDev and canvas
-            OutputDevice*                                           mpOutputDevice;
+            VclPtr<OutputDevice>                                    mpOutputDevice;
             com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas >    mxCanvas;
             com::sun::star::rendering::ViewState                    maViewState;
             com::sun::star::rendering::RenderState                  maRenderState;
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 86fd4ff70083..bd76598e071d 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -41,7 +41,7 @@ class ScEditUtil
     SCROW           nRow;
     SCTAB           nTab;
     Point           aScrPos;
-    VclPtr<OutputDevice>   pDev;           // MapMode has to be set
+    VclPtr<OutputDevice> pDev; // MapMode has to be set
     double          nPPTX;
     double          nPPTY;
     Fraction        aZoomX;
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index c895d036e2a0..33e910fc0cea 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -110,7 +110,7 @@ class ScHTMLExport : public ScExportBase
     OUString         aStreamPath;
     OUString         aFilterOptions;
     OUString         aCId;           // Content-Id for Mail-Export
-    OutputDevice*    pAppWin;        // for Pixel-work
+    VclPtr<OutputDevice> pAppWin;        // for Pixel-work
     FileNameMapPtr   pFileNameMap;        // for CopyLocalFileToINet
     OUString         aNonConvertibleChars;   // collect nonconvertible characters
     rtl_TextEncoding eDestEnc;
diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx
index bb71b6ca2f5d..2e8c8b1eac53 100644
--- a/sc/source/ui/inc/cbutton.hxx
+++ b/sc/source/ui/inc/cbutton.hxx
@@ -22,6 +22,7 @@
 
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
+#include <vcl/vclptr.hxx>
 
 class OutputDevice;
 
diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index e574f672429b..e4030752386a 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -23,6 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <tools/fract.hxx>
+#include <vcl/vclptr.hxx>
 
 class OutputDevice;
 class Point;
@@ -62,7 +63,7 @@ private:
     Fraction                maZoomX;
     Fraction                maZoomY;
     ScDocument*             mpDoc;
-    OutputDevice*           mpOutDev;
+    VclPtr<OutputDevice>    mpOutDev;
     const StyleSettings*    mpStyle;
     bool                    mbBaseButton;
     bool                    mbPopupButton;
diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx
index f98d76fd8982..94e8994df881 100644
--- a/sc/source/ui/inc/gridmerg.hxx
+++ b/sc/source/ui/inc/gridmerg.hxx
@@ -25,7 +25,7 @@ class OutputDevice;
 class ScGridMerger
 {
 private:
-    OutputDevice*   pDev;
+    VclPtr<OutputDevice> pDev;
     long            nOneX;
     long            nOneY;
     long            nFixStart;
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index 82864a3f98a2..265789578cca 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -130,7 +130,7 @@ class ScPrintFunc
 private:
     ScDocShell*         pDocShell;
     ScDocument*         pDoc;
-    SfxPrinter*         pPrinter;
+    VclPtr<SfxPrinter>   pPrinter;
     VclPtr<OutputDevice> pDev;
     FmFormView*         pDrawView;
 
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
index 65b390a4e4fa..45cbb91fd509 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx
@@ -29,7 +29,7 @@ namespace sc { namespace sidebar {
 class CellLineStyleValueSet : public ValueSet
 {
 private:
-    VirtualDevice*  pVDev;
+    VclPtr<VirtualDevice> pVDev;
     sal_uInt16      nSelItem;
     OUString        maStrUnit[CELL_LINE_STYLE_ENTRIES];
 public:
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 9db4ecced79d..195c1fd94d88 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -231,7 +231,7 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTa
         nTotalY(0),
         pPageData           ( pData )
 {
-    pDev = pPrinter;
+    pDev = pPrinter.get();
     aSrcOffset = pPrinter->PixelToLogic( pPrinter->GetPageOffsetPixel(), MAP_100TH_MM );
     Construct( pOptions );
 }
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index b012245b4132..f33e2122e10f 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -197,7 +197,7 @@ public :
 
 private:
 
-    VirtualDevice* pVDev;
+    VclPtr<VirtualDevice> pVDev;
     boost::ptr_vector<FontCollectionEntry> maFonts;
 };
 
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 9e60436b5e77..3ca01bd41836 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -59,8 +59,8 @@ class ViewClipboard;
 // SdViewRedrawRec
 struct SdViewRedrawRec
 {
-    OutputDevice* mpOut;
-    Rectangle     aRect;
+    VclPtr<OutputDevice> mpOut;
+    Rectangle            aRect;
 };
 
 //For master view we want to force that master
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index 7d20d8bd4863..0fb5fccba1a1 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -65,7 +65,7 @@ protected:
 private:
     DrawDocShell*   mpDocShell;
     DrawViewShell*  mpDrawViewShell;
-    VirtualDevice*  mpVDev;
+    VclPtr<VirtualDevice> mpVDev;
 
     sal_uInt16          mnPOCHSmph; ///< for blocking PageOrderChangedHint
 };
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 136c3838de29..4ac1100cd7a4 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -123,7 +123,7 @@ private:
     SdDrawDocument*                 mpSdDrawDocument;
     SdDrawDocument*                 mpSdDrawDocumentIntern;
     SdDrawDocument*                 mpSourceDoc;
-    VirtualDevice*                  mpVDev;
+    VclPtr<VirtualDevice>           mpVDev;
     INetBookmark*                   mpBookmark;
     Graphic*                        mpGraphic;
     ImageMap*                       mpImageMap;
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 3e659452fe7c..c34a95b87f30 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -132,7 +132,7 @@ public:
 class SwRefMarkFldUpdate : public SwMsgPoolItem
 {
 public:
-    const OutputDevice* pOut; ///< pointer to the current output device
+    VclPtr<OutputDevice> pOut; ///< pointer to the current output device
     /** Is sent if reference marks should be updated.
 
         To get the page/chapter number, the frame has to be asked. For that we need
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index fee34b12737e..b78d2db45bd5 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -41,7 +41,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..5cf565c08654 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -63,7 +63,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 +77,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,
diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx
index f3b007375bd1..287cfaf10355 100644
--- a/sw/source/core/layout/virtoutp.hxx
+++ b/sw/source/core/layout/virtoutp.hxx
@@ -32,8 +32,8 @@ class SwLayVout
     friend void _FrmFinit();    //deletes Vout
 private:
     SwViewShell*      pSh;
-    OutputDevice*   pOut;
-    VirtualDevice*  pVirDev;
+    VclPtr<OutputDevice>  pOut;
+    VclPtr<VirtualDevice> pVirDev;
     SwRect          aRect;
     SwRect          aOrgRect;
     Size            aSize;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 45680164e43a..aa896af8df09 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -155,8 +155,8 @@ protected:
     SwViewShell    *m_pVsh;
 
     // m_pOut is the output device, m_pRef is the device used for formatting
-    OutputDevice* m_pOut;
-    OutputDevice* m_pRef;
+    VclPtr<OutputDevice> m_pOut;
+    VclPtr<OutputDevice> m_pRef;
 
     // performance hack - this is only used by SwTxtFormatInfo but
     // because it's not even possible to dynamic_cast these things
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 81aa9fd489ba..7fb9ada2e7ad 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -47,7 +47,7 @@ protected:
     SwScriptInfo* pScriptInfo;
 
 private:
-    OutputDevice *pLastOut;
+    VclPtr<OutputDevice> pLastOut;
     short nChgCnt;
     SwRedlineItr *pRedln;
     size_t nStartIndex;
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 85890254dfbc..2008fefcff30 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -305,7 +305,7 @@ public:
 class SwHookOut
 {
     SwTxtSizeInfo* pInf;
-    OutputDevice* pOut;
+    VclPtr<OutputDevice> pOut;
     bool bOnWin;
 public:
     SwHookOut( SwTxtSizeInfo& rInfo );
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index c14c6560cf81..607d6c5cf3a1 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -29,7 +29,7 @@ class SwSaveClip
     const bool     bOn;
           bool     bChg;
 protected:
-    OutputDevice* pOut;
+    VclPtr<OutputDevice> pOut;
     void _ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
                    bool bEnlargeRect );
 public:
@@ -60,7 +60,7 @@ inline SwSaveClip::~SwSaveClip()
 class SwDbgOut
 {
 protected:
-        OutputDevice* pOut;
+        VclPtr<OutputDevice> pOut;
 public:
         inline SwDbgOut( OutputDevice* pOutDev, const bool bOn = true );
 };
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 41e318884a15..470a72e04689 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -100,7 +100,7 @@ class SwMailMergeOutputPage : public svt::OWizardPage
     VclPtr<SwMailMergeWizard>  m_pWizard;
 
     //some dialog data
-    Printer*        m_pTempPrinter;
+    VclPtr<Printer> m_pTempPrinter;
     OUString        m_sCC;
     OUString        m_sBCC;
 
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index e0f37dff6eef..ba57573e8483 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -45,7 +45,7 @@ class SwEnvPrtPage : public SfxTabPage
 
     sal_uInt16 m_aIds[ENV_VER_RGHT-ENV_HOR_LEFT+1];
 
-    Printer* pPrt;
+    VclPtr<Printer>     pPrt;
 
     SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 1953c29ffceb..123ffe098514 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -31,7 +31,7 @@ class SwLabItem;
 
 class SwLabPrtPage : public SfxTabPage
 {
-    Printer*      pPrinter;             // for the shaft setting - unfortunately
+    VclPtr<Printer>      pPrinter; // for the shaft setting - unfortunately
 
     VclPtr<RadioButton>  m_pPageButton;
     VclPtr<RadioButton>  m_pSingleButton;
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 84d369bfd624..134c84a93af9 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -62,7 +62,7 @@ friend class SwEnvPreview;
 
     SwEnvItem       aEnvItem;
     SwWrtShell      *pSh;
-    Printer         *pPrinter;
+    VclPtr<Printer> pPrinter;
     SfxItemSet      *pAddresseeSet;
     SfxItemSet      *pSenderSet;
     sal_uInt16      m_nEnvPrintId;
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index a586243ca71f..28f3c33d29b3 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -156,7 +156,7 @@ class SwStdFontTabPage : public SfxTabPage
     OUString        sShellLabel;
     OUString        sShellIndex;
 
-    SfxPrinter*         pPrt;
+    VclPtr<SfxPrinter>  pPrt;
     FontList*           pFontList;
     SwStdFontConfig*    pFontConfig;
     SwWrtShell*         pWrtShell;
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx
index 5485a1b971c6..20f30410f8ae 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx
@@ -47,7 +47,7 @@ protected:
     /** the printer should be set only once; since there are several
      * printer-related properties, remember the last printer and set it in
      * _postSetValues */
-    SfxPrinter*             mpPrinter;
+    VclPtr<SfxPrinter>      mpPrinter;
 
     virtual void _preSetValues ()
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE;