[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source

[Libreoffice Gerrit user]

 cui/source/inc/swpossizetabpage.hxx      |    1 +
 cui/source/tabpages/swpossizetabpage.cxx |   10 ++++++++++
 2 files changed, 11 insertions(+)

New commits:
commit 5ea33b0f99c3586e6be2fe39cc983ad72619a68f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 5 21:12:44 2018 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Fri Nov 16 00:49:00 2018 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 692c26408ca3a5d9cc34a07e3a34ac0b2d87d920)
    Reviewed-on: https://gerrit.libreoffice.org/63435
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index d9e326dee456..7702ff5045d7 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 7c9282ab7614..4a0e455e221c 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