diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-29 17:14:42 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-30 15:27:47 +0200 |
| commit | 31ae7509003b1e650463ee1468c0b315ba13efe6 (patch) | |
| tree | 8f52291bb86067feca1bd10dec5e5d8fe6848d06 /sw | |
| parent | f6f53f76e15f5eecc5b6ce56e471c53cebfea8ad (diff) | |
tdf#122607 sw: remove deleted SwTextFrame's cache entry
Apparently nothing else would remove the entry, and without SwTextFrame
it's not accessible any more.
If the entry was recently used, then the SwSaveSetLRUOfst usage in
SwViewShell::CalcLayout() will preserve it instead of giving the cache
entry to a new frame.
Change-Id: Id43fdbad2ac006853928e30a7b6768c3e3dc1667
Reviewed-on: https://gerrit.libreoffice.org/71541
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/bastyp/swcache.cxx | 9 | ||||
| -rw-r--r-- | sw/source/core/inc/swcache.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/text/txtfrm.cxx | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 705c49accd79..ff6d568b8e83 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -323,6 +323,15 @@ void SwCache::DeleteObj( SwCacheObj *pObj ) CHECK; } +void SwCache::Delete(void const*const pOwner, sal_uInt16 const nIndex) +{ + INCREMENT( m_nDelete ); + if (SwCacheObj *const pObj = Get(pOwner, nIndex, false)) + { + DeleteObj(pObj); + } +} + void SwCache::Delete( const void *pOwner ) { INCREMENT( m_nDelete ); diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index aa0e4188d608..9a6563e256ba 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -102,6 +102,7 @@ public: void ToTop( SwCacheObj *pObj ); bool Insert( SwCacheObj *pNew ); + void Delete(const void * pOwner, sal_uInt16 nIndex); void Delete( const void *pOwner ); void SetLRUOfst( const sal_uInt16 nOfst ); /// nOfst determines how many are not to be touched diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 90541798c63f..37c1c406d365 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -881,6 +881,10 @@ void SwTextFrame::DestroyImpl() SwTextFrame::~SwTextFrame() { + if (GetCacheIdx() != USHRT_MAX) + { + s_pTextCache->Delete(this, GetCacheIdx()); + } } namespace sw { |