[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 2 commits - sc/source

[Markus Mohrhard]

 sc/source/core/data/fillinfo.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 09a64f221b09683e636247b20b0b1ccdd8900039
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 30 02:25:16 2016 +0200

    stylistic changes in ScDocument::FillInfo
    
    Change-Id: I98bb25d414106259a809698941a000d6d0bc35e0
    Reviewed-on: https://gerrit.libreoffice.org/23634
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit b27428d2136e67ee7c7449a7db562a957af390d6)
    Reviewed-on: https://gerrit.libreoffice.org/25289
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 0b7d779..486adbfd 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);
commit a7402aee62c5ddcf57bf1e7ef6c3ed7d43636650
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 30 02:24:54 2016 +0200

    limit scope of another variable in ScDocument::FillInfo
    
    Change-Id: Ic53bcaa5e33f221a643de4e854990769b5c04a74
    Reviewed-on: https://gerrit.libreoffice.org/23633
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 8f0668a0e18f4fa01864ede5fa3f66b36bd4ad85)
    Reviewed-on: https://gerrit.libreoffice.org/25288
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 92c38bb..0b7d779 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -465,7 +465,6 @@ void ScDocument::FillInfo(
                     ScAttrArray* pThisAttrArr = pThisCol->pAttrArray;       // Attribute
                     nArrRow = 0;
 
-                    const ScPatternAttr* pPattern;
                     SCROW nCurRow=nRow1;                  // single rows
                     if (nCurRow>0)
                         --nCurRow;                      // 1 more on top
@@ -478,7 +477,7 @@ void ScDocument::FillInfo(
                     do
                     {
                         nThisRow=pThisAttrArr->pData[nIndex].nRow;              // End of range
-                        pPattern=pThisAttrArr->pData[nIndex].pPattern;
+                        const ScPatternAttr* pPattern=pThisAttrArr->pData[nIndex].pPattern;
 
                         const SvxBrushItem* pBackground = static_cast<const SvxBrushItem*>(
                                                         &pPattern->GetItem(ATTR_BACKGROUND));