summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2020-10-13 21:41:45 +0200
committerEike Rathke <erack@redhat.com>2020-10-14 11:19:55 +0200
commit18f8a7056ac7b4677f4d99aac24ed2db44010140 (patch)
treeb7f3ee6f5b393504b05e0ebe8e10ce5bde7390b8 /include
parent91a2dfe81dfecf09d9347a49a53e61d6bd2f82ce (diff)
Resolves: tdf#137453 Implicit conversion from sal_uInt64 to sal_Int32 is bad..
Change-Id: I5681249808cf623d3b7df09988f285268ea8d85f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104255 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/svl/zformat.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index c1a6f7388ec9..6ced6b0122ff 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -657,8 +657,8 @@ private:
SVL_DLLPRIVATE void ImpGetFractionElements( double& fNumber,
sal_uInt16 nIx,
double& fIntPart,
- sal_uInt64& nFrac,
- sal_uInt64& nDiv ) const;
+ sal_Int64& nFrac,
+ sal_Int64& nDiv ) const;
SVL_DLLPRIVATE bool ImpGetFractionOutput(double fNumber,
sal_uInt16 nIx,
OUStringBuffer& OutString);
@@ -697,10 +697,10 @@ private:
// normal digits or other digits, depending on ImpSvNumFor.aNatNum,
// [NatNum1], [NatNum2], ...
- SVL_DLLPRIVATE OUString ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal,
+ SVL_DLLPRIVATE OUString ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int64 nVal,
sal_uInt16 nMinDigits ) const;
- OUString ImpIntToString( sal_uInt16 nIx, sal_Int32 nVal, sal_uInt16 nMinDigits = 0 ) const
+ OUString ImpIntToString( sal_uInt16 nIx, sal_Int64 nVal, sal_uInt16 nMinDigits = 0 ) const
{
const SvNumberNatNum& rNum = NumFor[nIx].GetNatNum();
if ( nMinDigits || rNum.IsComplete() )