diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-20 10:31:48 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:27:19 +0100 |
| commit | 047362988b5b9910b41ef6cc7d12a685d849bcae (patch) | |
| tree | 55161f2f4790c6cbe86bfacc17f48ecbf74b96db /vcl | |
| parent | 12f6e237b8b7b8ff9508edc9e348a387290c240c (diff) | |
vclptr: various mistakes fixed, and more ptr types converted.
Change-Id: Iba04ec828f7ce37fc6ede28a64f1c286d81ff705
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/wmf/emfwr.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/gdi/print.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/outdev/outdev.cxx | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx index dd34bbcd3517..d4925c147147 100644 --- a/vcl/source/filter/wmf/emfwr.hxx +++ b/vcl/source/filter/wmf/emfwr.hxx @@ -33,7 +33,7 @@ class EMFWriter { private: - ScopedVclPtr<VirtualDevice> maVDev; + ScopedVclPtr<VirtualDevice> maVDev; MapMode maDestMapMode; SvStream& m_rStm; bool* mpHandlesUsed; @@ -91,6 +91,7 @@ public: EMFWriter(SvStream &rStream) : m_rStm(rStream) + , maVDev( new VirtualDevice() ) , mpHandlesUsed(NULL) , mnHandleCount(0) , mnRecordCount(0) diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 7ba564581514..7c48a7fa1fe3 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1024,6 +1024,7 @@ void Printer::dispose() DBG_ASSERT( !IsJobActive(), "Printer::~Printer() - Job is active" ); delete mpPrinterOptions; + mpPrinterOptions = NULL; ReleaseGraphics(); if ( mpInfoPrinter ) diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index d0d35ce0d57f..beee1b7fb63f 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -221,6 +221,7 @@ void OutputDevice::dispose() ImplInvalidateViewTransform(); delete mpOutDevData; + mpOutDevData = NULL; // for some reason, we haven't removed state from the stack properly if ( !mpOutDevStateStack->empty() ) @@ -232,6 +233,7 @@ void OutputDevice::dispose() } } delete mpOutDevStateStack; + mpOutDevStateStack = NULL; // release the active font instance if( mpFontEntry ) @@ -240,8 +242,10 @@ void OutputDevice::dispose() // remove cached results of GetDevFontList/GetDevSizeList // TODO: use smart pointers for them delete mpGetDevFontList; + mpGetDevFontList = NULL; delete mpGetDevSizeList; + mpGetDevSizeList = NULL; // release ImplFontCache specific to this OutputDevice // TODO: refcount ImplFontCache |