summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-03-16 20:08:30 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-03-17 10:17:17 +0000
commit0ee960fb555deb0a91e8c0e81812ab888ff13c2f (patch)
tree6ee32b30622725f9bd9c1f1f561a10a19991517e
parentb5c4e120540053d0cb737720503cb7038f12d5bd (diff)
the range should be updated after the references, tdf#104026
Change-Id: I2cb674b8b3bc64df031b473b337d266a2eaab43d Reviewed-on: https://gerrit.libreoffice.org/35289 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 3f0f35c89f3f64fcb110483fd562a59f729dc344) Reviewed-on: https://gerrit.libreoffice.org/35297 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--sc/source/core/data/conditio.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 6657dcf37608..f4f0f116ba61 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1926,13 +1926,13 @@ void ScConditionalFormat::CompileXML()
void ScConditionalFormat::UpdateReference( sc::RefUpdateContext& rCxt, bool bCopyAsMove )
{
+ for(CondFormatContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr)
+ (*itr)->UpdateReference(rCxt);
+
if (rCxt.meMode == URM_COPY && bCopyAsMove)
maRanges.UpdateReference(URM_MOVE, pDoc, rCxt.maRange, rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
else
maRanges.UpdateReference(rCxt.meMode, pDoc, rCxt.maRange, rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
-
- for(CondFormatContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr)
- (*itr)->UpdateReference(rCxt);
}
void ScConditionalFormat::InsertRow(SCTAB nTab, SCCOL nColStart, SCCOL nColEnd, SCROW nRowPos, SCSIZE nSize)