|
 |
f0633d |
From 1aa9bae0ffea4b37392175197f58f26001c06c66 Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
Date: Sat, 23 Nov 2013 12:16:51 +0100
|
|
|
f0633d |
Subject: [PATCH 012/109] resolved fdo#61946 use correct TabDelta for
|
|
|
f0633d |
UpdateReference
|
|
|
f0633d |
|
|
|
f0633d |
The sheet delta was reverted resulting in the references not being
|
|
|
f0633d |
updated when conditional formats were copy-pasted between sheets. Saved
|
|
|
f0633d |
to .ods then was an identical calcext:target-range-address as for the
|
|
|
f0633d |
copied source range.
|
|
|
f0633d |
|
|
|
f0633d |
(cherry picked from commit ef8e0beba442f58abe3bc77f6f55fc6109025dd4)
|
|
|
f0633d |
|
|
|
f0633d |
Backported.
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I038b58f20f71ff1393dccafa3021dac02cd69e4b
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/6768
|
|
|
f0633d |
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f0633d |
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
sc/source/core/data/table2.cxx | 2 +-
|
|
|
f0633d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
|
|
|
f0633d |
index 220211c..6c530d3 100644
|
|
|
f0633d |
--- a/sc/source/core/data/table2.cxx
|
|
|
f0633d |
+++ b/sc/source/core/data/table2.cxx
|
|
|
f0633d |
@@ -712,7 +712,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO
|
|
|
f0633d |
ScConditionalFormat* pNewFormat = itr->Clone(pDocument);
|
|
|
f0633d |
|
|
|
f0633d |
pNewFormat->AddRange(aIntersectedRange);
|
|
|
f0633d |
- pNewFormat->UpdateReference(URM_COPY, aNewRange, nDx, nDy, pTable->nTab - nTab, true);
|
|
|
f0633d |
+ pNewFormat->UpdateReference(URM_COPY, aNewRange, nDx, nDy, nTab - pTable->nTab, true);
|
|
|
f0633d |
|
|
|
f0633d |
sal_uLong nMax = 0;
|
|
|
f0633d |
for(ScConditionalFormatList::const_iterator itrCond = mpCondFormatList->begin();
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|