mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#94792 performance regression for xlsx with chart with >1000 data labels

Browse Source 
this speeds things up by 30% for me

Change-Id: I7fa99e91b0b4f354329803b9c8fab827bd367dac
Reviewed-on: https://gerrit.libreoffice.org/55812
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-06-14 17:02:05 +02:00
parent d8142da066
commit 2008384070
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
svl/source/notify/SfxBroadcaster.cxx
View File

@@ -124,13 +124,32 @@ void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint)
void SfxBroadcaster::RemoveListener( SfxListener& rListener ) void SfxBroadcaster::RemoveListener( SfxListener& rListener )
{ {
DBG_TESTSOLARMUTEX(); DBG_TESTSOLARMUTEX();
SfxListenerArr_Impl::iterator aIter = std::find(
mpImpl->m_Listeners.begin(), mpImpl->m_Listeners.end(), &rListener); // First, check the slots either side of the last removed slot, makes a significant
assert(aIter != mpImpl->m_Listeners.end()); // "RemoveListener: Listener unknown" // difference when the list is large.
int positionOfRemovedElement = -1;
if (!mpImpl->m_RemovedPositions.empty())
{
auto i = mpImpl->m_RemovedPositions.back();
if (i < mpImpl->m_Listeners.size() - 2 && mpImpl->m_Listeners[i+1] == &rListener)
{
positionOfRemovedElement = i + 1;
}
else if (i > 0 && mpImpl->m_Listeners[i-1] == &rListener)
{
positionOfRemovedElement = i-1;
}
}
// then scan the whole list if we didn't find it
if (positionOfRemovedElement == -1)
{
SfxListenerArr_Impl::iterator aIter = std::find(
mpImpl->m_Listeners.begin(), mpImpl->m_Listeners.end(), &rListener);
positionOfRemovedElement = std::distance(mpImpl->m_Listeners.begin(), aIter);
}
// DO NOT erase the listener, set the pointer to 0 // DO NOT erase the listener, set the pointer to 0
// because the current continuation may contain this->Broadcast // because the current continuation may contain this->Broadcast
*aIter = nullptr; mpImpl->m_Listeners[positionOfRemovedElement] = nullptr;
size_t positionOfRemovedElement = std::distance(mpImpl->m_Listeners.begin(), aIter);
mpImpl->m_RemovedPositions.push_back(positionOfRemovedElement); mpImpl->m_RemovedPositions.push_back(positionOfRemovedElement);
} }