include/sfx2/dinfdlg.hxx | 3 +++ sfx2/source/dialog/dinfdlg.cxx | 11 +++++++++++ 2 files changed, 14 insertions(+)
New commits: commit e76f0727393c0a4316767307dc89b24e86d4a848 Author: Giuseppe Castagno <[email protected]> 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 <[email protected]> Reviewed-by: David Tardon <[email protected]> (cherry picked from commit cadc130171a9bd4f1e6930fed09ad2897e9111b5) Reviewed-on: https://gerrit.libreoffice.org/22716 Reviewed-by: Markus Mohrhard <[email protected]> diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 4aefe3b..3cc1755 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 0eabee9..4d08444 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; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
