diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-02-25 17:15:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-01 11:36:01 +0000 |
| commit | 75433880cbb622808c30a91b064a6604fcd0c4a3 (patch) | |
| tree | a3d49428733bc59f995d799f559cdf7ef1c6cec8 | |
| parent | 61213fc0487d0d9e0f637f2e3101612ef11e412a (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/22785
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@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 a8b7d0406b71..ec846d69ccc9 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 6de3b56df334..f733e59b4243 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; |