diff options
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/brdwin.hxx | 8 | ||||
| -rw-r--r-- | vcl/inc/controldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/outdev.h | 3 | ||||
| -rw-r--r-- | vcl/inc/printdlg.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 20 | ||||
| -rw-r--r-- | vcl/inc/window.h | 2 |
6 files changed, 19 insertions, 18 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index fe1361fc84b8..77a690c75dc0 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -175,7 +175,7 @@ public: struct ImplBorderFrameData { VclPtr<ImplBorderWindow> mpBorderWindow; - OutputDevice* mpOutDev; + VclPtr<OutputDevice> mpOutDev; Rectangle maTitleRect; Rectangle maPinRect; Rectangle maCloseRect; @@ -254,7 +254,7 @@ public: class ImplSmallBorderWindowView : public ImplBorderWindowView { VclPtr<ImplBorderWindow> mpBorderWindow; - OutputDevice* mpOutDev; + VclPtr<OutputDevice> mpOutDev; long mnWidth; long mnHeight; sal_Int32 mnLeftBorder; @@ -276,8 +276,8 @@ public: class ImplStdBorderWindowView : public ImplBorderWindowView { ImplBorderFrameData maFrameData; - VirtualDevice* mpATitleVirDev; - VirtualDevice* mpDTitleVirDev; + VclPtr<VirtualDevice> mpATitleVirDev; + VclPtr<VirtualDevice> mpDTitleVirDev; public: ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ); diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx index 20720911d038..0ef77c809541 100644 --- a/vcl/inc/controldata.hxx +++ b/vcl/inc/controldata.hxx @@ -30,7 +30,7 @@ namespace vcl struct ImplControlData { mutable ControlLayoutData* mpLayoutData; - OutputDevice* mpReferenceDevice; + VclPtr<OutputDevice> mpReferenceDevice; ImplControlData() :mpLayoutData( NULL ) diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index a1e1b850d66c..eae0c597a03b 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -25,6 +25,7 @@ #include <vector> #include <tools/gen.hxx> +#include <vcl/vclptr.hxx> #include "outfont.hxx" #include "PhysicalFontFace.hxx" @@ -164,7 +165,7 @@ namespace basegfx { class B2DHomMatrix; } struct ImplOutDevData { - VirtualDevice* mpRotateDev; + VclPtr<VirtualDevice> mpRotateDev; vcl::ControlLayoutData* mpRecordLayout; Rectangle maRecordRect; diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index b470b7c37742..a071c9d5cbac 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -51,7 +51,7 @@ namespace vcl GDIMetaFile maMtf; Size maOrigSize; Size maPreviewSize; - VirtualDevice maPageVDev; + VclPtr<VirtualDevice> maPageVDev; Bitmap maPreviewBitmap; OUString maReplacementString; OUString maToolTipString; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 4377d0c58b91..fc285cd7e7ed 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -153,18 +153,18 @@ struct ImplSVAppData struct ImplSVGDIData { - OutputDevice* mpFirstWinGraphics; // First OutputDevice with a Frame Graphics - OutputDevice* mpLastWinGraphics; // Last OutputDevice with a Frame Graphics - OutputDevice* mpFirstVirGraphics; // First OutputDevice with a VirtualDevice Graphics - OutputDevice* mpLastVirGraphics; // Last OutputDevice with a VirtualDevice Graphics - OutputDevice* mpFirstPrnGraphics; // First OutputDevice with a InfoPrinter Graphics - OutputDevice* mpLastPrnGraphics; // Last OutputDevice with a InfoPrinter Graphics - VirtualDevice* mpFirstVirDev; // First VirtualDevice - VirtualDevice* mpLastVirDev; // Last VirtualDevice + VclPtr<OutputDevice> mpFirstWinGraphics; // First OutputDevice with a Frame Graphics + VclPtr<OutputDevice> mpLastWinGraphics; // Last OutputDevice with a Frame Graphics + VclPtr<OutputDevice> mpFirstVirGraphics; // First OutputDevice with a VirtualDevice Graphics + VclPtr<OutputDevice> mpLastVirGraphics; // Last OutputDevice with a VirtualDevice Graphics + VclPtr<OutputDevice> mpFirstPrnGraphics; // First OutputDevice with a InfoPrinter Graphics + VclPtr<OutputDevice> mpLastPrnGraphics; // Last OutputDevice with a InfoPrinter Graphics + VclPtr<VirtualDevice> mpFirstVirDev; // First VirtualDevice + VclPtr<VirtualDevice> mpLastVirDev; // Last VirtualDevice OpenGLContext* mpFirstContext; // First OpenGLContext OpenGLContext* mpLastContext; // Last OpenGLContext - Printer* mpFirstPrinter; // First Printer - Printer* mpLastPrinter; // Last Printer + VclPtr<Printer> mpFirstPrinter; // First Printer + VclPtr<Printer> mpLastPrinter; // Last Printer ImplPrnQueueList* mpPrinterQueueList; // List of all printer queue PhysicalFontCollection* mpScreenFontList; // Screen-Font-List ImplFontCache* mpScreenFontCache; // Screen-Font-Cache diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 4bc12075b8a8..dfe65071ac19 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -121,7 +121,7 @@ struct ImplWinData struct ImplOverlapData { - VirtualDevice* mpSaveBackDev; //< saved background bitmap + VclPtr<VirtualDevice> mpSaveBackDev; //< saved background bitmap vcl::Region* mpSaveBackRgn; //< saved region, which must be invalidated VclPtr<vcl::Window> mpNextBackWin; //< next window with saved background sal_uIntPtr mnSaveBackSize; //< bitmap size of saved background |