[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/sfx2 sfx2/source

[Giuseppe Castagno]

 include/sfx2/dinfdlg.hxx       |    3 +++
 sfx2/source/dialog/dinfdlg.cxx |   11 +++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 75433880cbb622808c30a91b064a6604fcd0c4a3
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Thu Feb 25 17:15:38 2016 +0100

    tdf#98188: Crash when closing File->Properties->CMIS Properties tab
    
    Change-Id: I22e1d6cc1c50b9ae613dab7c253ba21451aac584
    Reviewed-on: https://gerrit.libreoffice.org/22704
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit cadc130171a9bd4f1e6930fed09ad2897e9111b5)
    Reviewed-on: https://gerrit.libreoffice.org/22785
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index a8b7d04..ec846d6 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -649,6 +649,9 @@ protected:
 
 public:
     SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
+    virtual ~SfxCmisPropertiesPage();
+    virtual void dispose() override;
+
     static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
 };
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 6de3b56..f733e59 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2672,6 +2672,17 @@ SfxCmisPropertiesPage::SfxCmisPropertiesPage( vcl::Window* pParent, const SfxIte
 {
 }
 
+SfxCmisPropertiesPage::~SfxCmisPropertiesPage()
+{
+    disposeOnce();
+}
+
+void SfxCmisPropertiesPage::dispose()
+{
+    m_pPropertiesCtrl.ClearAllLines();
+    SfxTabPage::dispose();
+}
+
 bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet* rSet )
 {
     const SfxPoolItem* pItem = NULL;