diff options
author | Noel <noelgrandin@gmail.com> | 2020-10-26 14:17:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-28 07:21:59 +0100 |
commit | 6436302f40252bc6619e304e2051115fee902e20 (patch) | |
tree | a32659b4fecc9fbf8fad3e379ddd8645a2a52e0b /sc/inc | |
parent | 35f16614ee7ddf518d4c01de6b1d800f5ff1ba7e (diff) |
convert some more long -> tools::Long
grepping for stuff in template params this time
Change-Id: Ia37bfd85480b3a72c3c465489581d56ad8dde851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104855
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/dpgroup.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dptabdat.hxx | 10 | ||||
-rw-r--r-- | sc/inc/dptabres.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dptabsrc.hxx | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index f30f85f6f394..720e07a3c8da 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -122,7 +122,7 @@ class ScDPGroupTableData final : public ScDPTableData pNumGroups; // array[nSourceCount] ScDocument* pDoc; - void FillGroupValues(std::vector<SCROW>& rItems, const std::vector<long>& rDims); + void FillGroupValues(std::vector<SCROW>& rItems, const std::vector<tools::Long>& rDims); virtual tools::Long GetSourceDim( tools::Long nDim ) override; bool IsNumGroupDimension( tools::Long nDimension ) const; diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 8f8aa3cd578c..8ab4eb167b7f 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -69,14 +69,14 @@ public: should be passed as a const instance. */ struct SAL_DLLPRIVATE CalcInfo { - ::std::vector<long> aColLevelDims; + ::std::vector<tools::Long> aColLevelDims; ::std::vector<ScDPDimension*> aColDims; ::std::vector<ScDPLevel*> aColLevels; - ::std::vector<long> aRowLevelDims; + ::std::vector<tools::Long> aRowLevelDims; ::std::vector<ScDPDimension*> aRowDims; ::std::vector<ScDPLevel*> aRowLevels; - ::std::vector<long> aPageDims; - ::std::vector<long> aDataSrcCols; + ::std::vector<tools::Long> aPageDims; + ::std::vector<tools::Long> aDataSrcCols; ScDPInitState* pInitState; ScDPResultMember* pColRoot; @@ -154,7 +154,7 @@ protected: private: void GetItemData(const ScDPFilteredCache& rCacheTable, sal_Int32 nRow, - const ::std::vector<long>& rDims, ::std::vector< SCROW >& rItemData); + const ::std::vector<tools::Long>& rDims, ::std::vector< SCROW >& rItemData); }; #endif diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 2ea654a9c32f..7a8f23564720 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -105,7 +105,7 @@ struct ScDPSubTotalState class ScDPRunningTotalState { public: - typedef std::vector<long> IndexArray; /// array of long integers terminated by -1. + typedef std::vector<tools::Long> IndexArray; /// array of long integers terminated by -1. ScDPRunningTotalState( ScDPResultMember* pColRoot, ScDPResultMember* pRowRoot ); diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 692eb2a987fa..106c6cd74b66 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -85,10 +85,10 @@ private: rtl::Reference<ScDPDimensions> pDimensions; // api objects // settings: - std::vector<long> maColDims; - std::vector<long> maRowDims; - std::vector<long> maDataDims; - std::vector<long> maPageDims; + std::vector<tools::Long> maColDims; + std::vector<tools::Long> maRowDims; + std::vector<tools::Long> maDataDims; + std::vector<tools::Long> maPageDims; ScDPResultTree maResFilterSet; bool bColumnGrand; |