summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-03-20 11:58:25 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 13:01:46 +0100
commit98586079c3961f32d9eaee9731ee053bc8bf1887 (patch)
tree90d696fa10470545e0a50f929ac87f23e0b7e45a /sd/source
parent395ae19356a8128ec47e2526e0342ca2905ea707 (diff)
Convert last vestiges of OutputDevice* and VirtualDevice* members.
Change-Id: I2353d8e9f2b30bf00cf5229613793d9605854b76
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/filter/eppt/epptbase.hxx2
-rw-r--r--sd/source/ui/inc/View.hxx4
-rw-r--r--sd/source/ui/inc/drawview.hxx2
-rw-r--r--sd/source/ui/inc/sdxfer.hxx2
4 files changed, 5 insertions, 5 deletions
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;