diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-06-16 14:13:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-05 17:40:20 +0200 |
commit | 9eed346b0b745f0598eefc572c789d58353b5e31 (patch) | |
tree | a3c3eaf7b0b924a5e9d63bf6e12667049ef927db /include/svl | |
parent | 6209fcbdc694ca0ef22f157d3f5c5b74ed8c76c8 (diff) |
crash on exit of cppunit tests
rework EditEngineItemPools own their default items
and use a global weak_ptr to share them between instances
Change-Id: Ifda3619a175eba3fcad81918c71b16a4d6dd663a
Reviewed-on: https://gerrit.libreoffice.org/38885
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svl')
-rw-r--r-- | include/svl/itempool.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 151a64d367fd..eced0598bad6 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -106,7 +106,8 @@ public: const SfxPoolItem* GetPoolDefaultItem( sal_uInt16 nWhich ) const; void ResetPoolDefaultItem( sal_uInt16 nWhich ); - void SetDefaults( std::vector<SfxPoolItem*>* pDefaults ); + void SetDefaults(std::vector<SfxPoolItem*>* pDefaults); + void ClearDefaults(); void ReleaseDefaults( bool bDelete = false ); static void ReleaseDefaults( std::vector<SfxPoolItem*> *pDefaults, bool bDelete = false ); |