diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-23 17:30:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-24 07:59:16 +0100 |
| commit | a1c0e999b271ac4c6ecb163a1cd2a310b87e9dec (patch) | |
| tree | 4ef50e0aec9dd0dc6db0d9927cebe71a512bf5c8 /sc/inc/dociter.hxx | |
| parent | 35f5274ece0fcbb70753a71619b526ed0d4cbd6b (diff) | |
consistently use sal_uInt32 for number formats in sc
instead of a mix of short/sal_uLong/sal_uInt32
Change-Id: Ie5bd26e1a6f716c0c4e174a6d560827084b3f421
Reviewed-on: https://gerrit.libreoffice.org/45159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc/dociter.hxx')
| -rw-r--r-- | sc/inc/dociter.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 904f471c3c4f..6e8011438d73 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -53,8 +53,8 @@ class ScValueIterator // walk through all values in an area ScDocument* pDoc; const ScAttrArray* pAttrArray; - sal_uLong nNumFormat; // for CalcAsShown - sal_uLong nNumFmtIndex; + sal_uInt32 nNumFormat; // for CalcAsShown + sal_uInt32 nNumFmtIndex; ScAddress maStartPos; ScAddress maEndPos; SCCOL mnCol; @@ -85,7 +85,7 @@ public: ScDocument* pDocument, const ScRange& rRange, SubtotalFlags nSubTotalFlags = SubtotalFlags::NONE, bool bTextAsZero = false ); - void GetCurNumFmtInfo( const ScInterpreterContext& rContext, short& nType, sal_uLong& nIndex ); + void GetCurNumFmtInfo( const ScInterpreterContext& rContext, sal_uInt32& nType, sal_uInt32& nIndex ); /// Does NOT reset rValue if no value found! bool GetFirst( double& rValue, FormulaError& rErr ); @@ -142,13 +142,13 @@ private: ScDocument* mpDoc; const ScInterpreterContext& mrContext; const ScAttrArray* pAttrArray; - sal_uLong nNumFormat; // for CalcAsShown - sal_uLong nNumFmtIndex; + sal_uInt32 nNumFormat; // for CalcAsShown + sal_uInt32 nNumFmtIndex; SCCOL nCol; SCROW nRow; SCROW nAttrEndRow; SCTAB nTab; - short nNumFmtType; + sal_uInt32 nNumFmtType; bool bCalcAsShown; }; @@ -454,7 +454,7 @@ private: const ScAttrArray *pAttrArray; std::unique_ptr<ScHorizontalCellIterator> pCellIter; - sal_uLong nNumFormat; // for CalcAsShown + sal_uInt32 nNumFormat; // for CalcAsShown SCTAB nEndTab; SCCOL nCurCol; SCROW nCurRow; |