diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-02-25 17:15:38 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-02-26 09:01:05 +0000 |
| commit | cadc130171a9bd4f1e6930fed09ad2897e9111b5 (patch) | |
| tree | 986e230dffb7cef51061aef276fe51f64fc23df1 | |
| parent | 692f14208001e646f46c9cd7f85fc93aba4b3982 (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>
| -rw-r--r-- | include/sfx2/dinfdlg.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index c94a7de5a345..9fe15533ce7a 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -635,6 +635,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 77ed82c8786e..7d2ae6184cf5 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2671,6 +2671,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; |