cui/source/inc/swpossizetabpage.hxx | 1 +
cui/source/tabpages/swpossizetabpage.cxx | 10 ++++++++++
2 files changed, 11 insertions(+)
New commits:
commit 692c26408ca3a5d9cc34a07e3a34ac0b2d87d920
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 5 21:12:44 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Oct 6 00:58:22 2018 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
