From 98586079c3961f32d9eaee9731ee053bc8bf1887 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Fri, 20 Mar 2015 11:58:25 +0000
Subject: Convert last vestiges of OutputDevice* and VirtualDevice* members.

Change-Id: I2353d8e9f2b30bf00cf5229613793d9605854b76
---
 sc/inc/editutil.hxx                            | 2 +-
 sc/source/filter/inc/htmlexp.hxx               | 2 +-
 sc/source/ui/inc/cbutton.hxx                   | 1 +
 sc/source/ui/inc/dpcontrol.hxx                 | 3 ++-
 sc/source/ui/inc/gridmerg.hxx                  | 2 +-
 sc/source/ui/inc/printfun.hxx                  | 2 +-
 sc/source/ui/sidebar/CellLineStyleValueSet.hxx | 2 +-
 sc/source/ui/view/printfun.cxx                 | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'sc')

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 );
 }
-- 
cgit