diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-02-26 16:36:38 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:23:15 +0100 |
| commit | f0969f0de927e4f63ef4e111a1ffaa841f2a81ea (patch) | |
| tree | 77d208842c7e2cb361bc0f84c22be86fdb81f5b8 /svtools | |
| parent | 532dccdc02137540dcecc5b9dd48dfd72947bd48 (diff) | |
more double dispose protection.
Change-Id: I61ecf1561393959bc9a3647d515c4c9ce5119752
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 2f9c39c732ce..9f26c98ca2d3 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -173,7 +173,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl() aVerSBar.disposeAndClear(); aHorSBar.disposeAndClear(); aScrBarBox.disposeAndClear(); - } void SvxIconChoiceCtrl_Impl::Clear( bool bInCtor ) diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 3e8db3bca16f..d79b2a330879 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -216,7 +216,8 @@ void SvtIconChoiceCtrl::GetFocus() void SvtIconChoiceCtrl::LoseFocus() { - _pImp->LoseFocus(); + if (_pImp) + _pImp->LoseFocus(); Control::LoseFocus(); } |