summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-03-30 02:25:16 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-03-30 03:48:25 +0000
commitb27428d2136e67ee7c7449a7db562a957af390d6 (patch)
treeaf65eb9dcdb0682ab4e295b4ae240e1ad53dd766
parentlimit scope of another variable in ScDocument::FillInfo (diff)
downloadcore-b27428d2136e67ee7c7449a7db562a957af390d6.tar.gz
core-b27428d2136e67ee7c7449a7db562a957af390d6.zip
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>
-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 c3dd4800a911..71d0e021edb4 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);