summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-05-25 23:28:04 -0400
committerAshod Nakashian <ashnakash@gmail.com>2016-05-26 03:29:53 +0000
commit04a18136b186753cd303057155141957c9a90500 (patch)
treee37119f2dd031fcc4db139a56c3348ad22e2eeea
parent260f3ff257d7839119c8221397d18a516afd8799 (diff)
widen table-info capacity and count to SCSIZE
Change-Id: Id659978e71c7027bc1c58f0bc276da38e1ada4ba Reviewed-on: https://gerrit.libreoffice.org/25488 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
-rw-r--r--sc/inc/fillinfo.hxx6
-rw-r--r--sc/source/core/data/fillinfo.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 419f1c962173..3b42dff35be7 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 8a543df27592..e779b6a53d6f 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;
}