diff options
| author | Eike Rathke <erack@redhat.com> | 2015-07-09 21:05:20 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-07-09 21:13:43 +0200 |
| commit | 2aefb89b299e7ebdca5bb35aa4e9059e59805715 (patch) | |
| tree | 6100af68019bdee351fc849d885103a8b2d2ae1f /sc | |
| parent | 57792314c7b05f71c66834ee47bfaa09003df765 (diff) | |
execute the terrible bottle neck loop only if there are conditional formats
Change-Id: Ic8bd65a728289c9fa1a0721b0ecbd9b4a48672ca
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/conditio.hxx | 1 | ||||
| -rw-r--r-- | sc/source/core/data/conditio.cxx | 5 | ||||
| -rw-r--r-- | sc/source/core/data/documen7.cxx | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index fc039c0a8246..4a813c998844 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -495,6 +495,7 @@ public: const_iterator end() const; size_t size() const; + bool empty() const; void erase(sal_uLong nIndex); diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 172556fa9d80..214217e0d64e 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -2321,6 +2321,11 @@ size_t ScConditionalFormatList::size() const return maConditionalFormats.size(); } +bool ScConditionalFormatList::empty() const +{ + return maConditionalFormats.empty(); +} + void ScConditionalFormatList::erase( sal_uLong nIndex ) { for( iterator itr = begin(); itr != end(); ++itr ) diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index 216bec2cabce..c60619e74f24 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -141,8 +141,11 @@ void ScDocument::BroadcastCells( const ScRange& rRange, sal_uLong nHint, bool bB continue; ScConditionalFormatList* pCondFormList = GetCondFormList(nTab); - if (pCondFormList) + if (pCondFormList && !pCondFormList->empty()) { + /* TODO: looping over all possible cells is a terrible bottle neck, + * for each cell looping over all conditional formats even worse, + * this certainly needs a better method. */ ScAddress aAddress( 0, 0, nTab); for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow) { |