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 /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 'svl')
| -rw-r--r-- | svl/source/items/itempool.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index fcd84bf6b510..1327a2bfea9c 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -257,7 +257,6 @@ SfxItemPool::SfxItemPool SetSecondaryPool( rPool.pImpl->mpSecondary->Clone() ); } - void SfxItemPool::SetDefaults( std::vector<SfxPoolItem*>* pDefaults ) { DBG_ASSERT( pDefaults, "first we ask for it, and then we don't give back..." ); @@ -280,6 +279,10 @@ void SfxItemPool::SetDefaults( std::vector<SfxPoolItem*>* pDefaults ) } } +void SfxItemPool::ClearDefaults() +{ + pImpl->mpStaticDefaults = nullptr; +} /** * Frees the static Defaults of the corresponding SfxItemPool instance |