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

[Ashod Nakashian]

 sc/inc/fillinfo.hxx              |    6 +++---
 sc/source/core/data/fillinfo.cxx |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 04a18136b186753cd303057155141957c9a90500
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed May 25 23:28:04 2016 -0400

    widen table-info capacity and count to SCSIZE
    
    Change-Id: Id659978e71c7027bc1c58f0bc276da38e1ada4ba
    Reviewed-on: https://gerrit.libreoffice.org/25488
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 419f1c9..3b42dff 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -195,11 +195,11 @@ struct ScTableInfo
 {
     svx::frame::Array   maArray;
     RowInfo*            mpRowInfo;
-    sal_uInt16          mnArrCount;
-    sal_uInt16          mnArrCapacity;
+    SCSIZE              mnArrCount;
+    SCSIZE              mnArrCapacity;
     bool                mbPageMode;
 
-    explicit            ScTableInfo(const sal_uInt16 capacity = 1024);
+    explicit            ScTableInfo(const SCSIZE capacity = 1024);
                         ~ScTableInfo();
     ScTableInfo(const ScTableInfo&) = delete;
     const ScTableInfo& operator=(const ScTableInfo&) = delete;
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 8a543df..e779b6a 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -1123,7 +1123,7 @@ void ScDocument::FillInfo(
         rArray.MirrorSelfX( true, false );
 }
 
-ScTableInfo::ScTableInfo(const sal_uInt16 capacity)
+ScTableInfo::ScTableInfo(const SCSIZE capacity)
     : mpRowInfo(new RowInfo[capacity])
     , mnArrCount(0)
     , mnArrCapacity(capacity)
@@ -1134,7 +1134,7 @@ ScTableInfo::ScTableInfo(const sal_uInt16 capacity)
 
 ScTableInfo::~ScTableInfo()
 {
-    for( sal_uInt16 nIdx = 0; nIdx < mnArrCapacity; ++nIdx )
+    for( SCSIZE nIdx = 0; nIdx < mnArrCapacity; ++nIdx )
         delete [] mpRowInfo[ nIdx ].pCellInfo;
     delete [] mpRowInfo;
 }