summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2016-02-25 17:15:38 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-02-27 12:09:38 +0000
commite76f0727393c0a4316767307dc89b24e86d4a848 (patch)
tree2a90e5d11548f159e0d19cf53d1564e07ba68c82
parentec147c723cc6266b596cde761986ee77fd383006 (diff)
tdf#98188: Crash when closing File->Properties->CMIS Properties tab
Change-Id: I22e1d6cc1c50b9ae613dab7c253ba21451aac584 Reviewed-on: https://gerrit.libreoffice.org/22704 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit cadc130171a9bd4f1e6930fed09ad2897e9111b5) Reviewed-on: https://gerrit.libreoffice.org/22716 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--include/sfx2/dinfdlg.hxx3
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx11
2 files changed, 14 insertions, 0 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 4aefe3b478bb..3cc175551d26 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -636,6 +636,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 0eabee97a104..4d0844408839 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2689,6 +2689,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 = nullptr;