diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-19 17:47:31 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:26:07 +0100 |
| commit | e218bbcbf60345115772ccb2fa63418c13895bd0 (patch) | |
| tree | 29d9fb87ba270b6e5464b1440fb931868d4e3f4a /starmath | |
| parent | b129ee5021b7f56dfd936d53a46d274880edc0a9 (diff) | |
Move OutputDevice members to VclPtr: starmath, svx.
Change-Id: I1a5174334f41bc319e0806b9d324be64ba6d0135
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/dialog.hxx | 4 | ||||
| -rw-r--r-- | starmath/inc/smmod.hxx | 2 | ||||
| -rw-r--r-- | starmath/inc/visitors.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/smmod.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 9a0bb75b3bdb..df824c74f35a 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -154,7 +154,7 @@ class SmFontTypeDialog : public ModalDialog VclPtr<MenuButton> m_pMenuButton; VclPtr<PushButton> m_pDefaultButton; - OutputDevice *pFontListDev; + VclPtr<OutputDevice> pFontListDev; DECL_LINK(MenuSelectHdl, Menu *); DECL_LINK(DefaultButtonClickHdl, Button *); @@ -359,7 +359,7 @@ class SmSymbolDialog : public ModalDialog OUString aSymbolSetName; SymbolPtrVec_t aSymbolSet; - OutputDevice *pFontListDev; + VclPtr<OutputDevice> pFontListDev; DECL_LINK(SymbolSetChangeHdl, void*); DECL_LINK(SymbolChangeHdl, void*); diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 7d26cd9d8425..640d20fb5b3c 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -90,7 +90,7 @@ class SmModule : public SfxModule, utl::ConfigurationListener SmConfig *pConfig; SmLocalizedSymbolData *pLocSymbolData; SvtSysLocale *pSysLocale; - VirtualDevice *pVirtualDev; + VclPtr<VirtualDevice> pVirtualDev; void _CreateSysLocale() const; void _CreateVirtualDev() const; diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx index 5ae12773d673..1d26ddcdd7d5 100644 --- a/starmath/inc/visitors.hxx +++ b/starmath/inc/visitors.hxx @@ -144,7 +144,7 @@ public: } private: SmCaretLine line; - OutputDevice *pDev; + VclPtr<OutputDevice> pDev; SmCaretPos pos; protected: /** Default method for computing lines for pNodes */ diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index e6b12c44401e..93909215492f 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -183,7 +183,7 @@ SmModule::~SmModule() delete pColorConfig; delete pLocSymbolData; delete pSysLocale; - delete pVirtualDev; + pVirtualDev.disposeAndClear(); } void SmModule::_CreateSysLocale() const |