diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-19 17:19:43 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:22:44 +0100 |
| commit | 23d833dd3fba1c05a7d7552de6037cf3723bbfcc (patch) | |
| tree | 6398e95d3b9c0e1231fb04809bccfabde498f474 | |
| parent | d2d83f5a8a0f6f84c4e2692229c960b6677878ef (diff) | |
Move OutputDevice members to VclPtr: chart2, sfx2, cui.
Change-Id: If9228f8777edd4532e9a167eae23095c5e232a6c
| -rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.cxx | 4 | ||||
| -rw-r--r-- | cui/source/inc/page.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/page.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/printhelper.cxx | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index ce2a54e56f62..937dd4792f05 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -181,8 +181,8 @@ private: VclPtr< FixedImage > m_spSymbol; VclPtr< SeriesHeaderEdit > m_spSeriesName; VclPtr< FixedText > m_spColorBar; - OutputDevice * m_pDevice; - Link m_aChangeLink; + VclPtr< OutputDevice> m_pDevice; + Link m_aChangeLink; void notifyChanges(); DECL_LINK( SeriesNameChanged, void * ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index f34239c850f2..0b759591dd3f 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -140,7 +140,7 @@ private: //UUUU SvxPage_Impl* pImpl; MarginPosition m_nPos; - Printer* mpDefPrinter; + VclPtr<Printer> mpDefPrinter; bool mbDelPrinter : 1; diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 520332ada3e7..c9ecb88fcec0 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -373,8 +373,7 @@ void SvxPageDescPage::dispose() { if(mbDelPrinter) { - delete mpDefPrinter; - mpDefPrinter = NULL; + mpDefPrinter.disposeAndClear(); mbDelPrinter = false; } m_pPaperSizeBox.clear(); diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 1d056eb69900..e5f6b15dd499 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -477,7 +477,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread { private: /// of course we must know the printer which execute the job - SfxPrinter* m_pPrinter; + VclPtr<SfxPrinter> m_pPrinter; /// this describes the target location for the printed temp file OUString m_sTargetURL; /// it holds the temp file alive, till the print job will finish and remove it from disk automatically if the object die @@ -504,7 +504,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread SolarMutexGuard aGuard; while( m_pPrinter->IsPrinting() ) Application::Yield(); - m_pPrinter = NULL; // don't delete it! It's borrowed only :-) + m_pPrinter.clear(); // don't delete it! It's borrowed only :-) } /* } SAFE */ |