summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-03-30 02:25:16 +0200
committerAshod Nakashian <ashnakash@gmail.com>2016-05-22 03:35:23 +0000
commit09a64f221b09683e636247b20b0b1ccdd8900039 (patch)
tree00a5d9326b2f6ecfce8350f5a87a56e7d2d6774f
parenta7402aee62c5ddcf57bf1e7ef6c3ed7d43636650 (diff)
stylistic changes in ScDocument::FillInfo
Change-Id: I98bb25d414106259a809698941a000d6d0bc35e0 Reviewed-on: https://gerrit.libreoffice.org/23634 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit b27428d2136e67ee7c7449a7db562a957af390d6) Reviewed-on: https://gerrit.libreoffice.org/25289 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
-rw-r--r--sc/source/core/data/fillinfo.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 0b7d779c03af..486adbfd6152 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -470,8 +470,9 @@ void ScDocument::FillInfo(
--nCurRow; // 1 more on top
else
nArrRow = 1;
+
SCROW nThisRow = nCurRow; // end of range
- SCSIZE nIndex;
+ SCSIZE nIndex;
(void) pThisAttrArr->Search( nCurRow, nIndex );
do
@@ -599,6 +600,7 @@ void ScDocument::FillInfo(
}
// if style is not there, treat like no condition
}
+
if(aData.pColorScale)
{
pInfo->pColorScale.reset(aData.pColorScale);
@@ -610,6 +612,7 @@ void ScDocument::FillInfo(
pInfo->pDataBar.reset(aData.pDataBar);
bFound = true;
}
+
if(aData.pIconSet)
{
pInfo->pIconSet.reset(aData.pIconSet);