diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-05 21:12:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-06 00:58:22 +0200 |
| commit | 692c26408ca3a5d9cc34a07e3a34ac0b2d87d920 (patch) | |
| tree | 71f70ed73e04d89ee85300e434809f236a9c350c | |
| parent | d70746d17b1baa610eae0ec0088388b95bf30b11 (diff) | |
Resolves: tdf#120334 crash on ESC in position and size
Change-Id: I50421f01ca368ec4d074db4b0add2f08b7b3fc0d
Reviewed-on: https://gerrit.libreoffice.org/61448
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/inc/swpossizetabpage.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 9171ddf6cf04..a00e7b579031 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -113,6 +113,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage public: SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs); + virtual void dispose() override; virtual ~SvxSwPosSizeTabPage() override; static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index fb8c48facc2a..5dd07ce9ff4b 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -595,6 +595,16 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() { + disposeOnce(); +} + +void SvxSwPosSizeTabPage::dispose() +{ + m_xWidthMF.reset(); + m_xHeightMF.reset(); + m_xHoriByMF.reset(); + m_xVertByMF.reset(); + SfxTabPage::dispose(); } namespace |