diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-17 08:55:36 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:33:58 +0100 |
| commit | e35bc27fdc648ee433c755312fa79263b49f1339 (patch) | |
| tree | bb84b18a4958f85f3da393c68201fe0ead5eb0fd /vcl | |
| parent | 683cb12163803af2888b17ee4902e319c8bc49b4 (diff) | |
vclwidget: make sure we have an explicit destructor
Change-Id: I50490ad8957e8069e72e855f0f5a3b694218fd6b
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/dbggui.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/layout.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/generic/app/i18n_status.cxx | 1 | ||||
| -rw-r--r-- | vcl/workben/svpclient.cxx | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 65e2d1351c82..852220922cda 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -217,6 +217,7 @@ public: void SetInfoText( const OUString& rStr ); private: virtual void dispose() SAL_OVERRIDE; + virtual ~DbgInfoDialog() { disposeOnce(); } }; class DbgDialog : public ModalDialog @@ -238,6 +239,7 @@ public: void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; private: virtual void dispose() SAL_OVERRIDE; + virtual ~DbgDialog() { disposeOnce(); } }; DbgDialog::DbgDialog() : @@ -831,7 +833,7 @@ void DbgGUIStart() if ( pData ) { - std::unique_ptr<DbgDialog> xDialog(new DbgDialog); + VclPtr<DbgDialog> pDialog(new DbgDialog); // we switch off dialog tests for the debug dialog sal_uLong nOldFlags = pData->nTestFlags; pData->nTestFlags &= ~DBG_TEST_DIALOG; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index d0933b12aaf3..34de14a1aeb3 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1903,6 +1903,11 @@ void VclEventBox::Command(const CommandEvent&) //discard events by default to block them reaching children } +VclEventBox::~VclEventBox() +{ + disposeOnce(); +} + void VclEventBox::dispose() { m_aEventBoxHelper.disposeAndClear(); diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index e05f29ca788a..210171363843 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -316,6 +316,7 @@ public: virtual void setText( const OUString & ) SAL_OVERRIDE; virtual void show( bool bShow, I18NStatus::ShowReason eReason ) SAL_OVERRIDE; virtual void toggle( bool bOn ) SAL_OVERRIDE; + virtual ~IIIMPStatusWindow() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; void layout(); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 7bbcdf2144f0..ee218bb80687 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -108,6 +108,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; + virtual ~MyWin() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; void parseList( const OString& rList ); |