diff options
| author | Eike Rathke <erack@redhat.com> | 2020-10-13 21:41:45 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-01-12 11:13:33 +0100 |
| commit | d7842f4b21f167f0ddf0716ac492695f3f1425e3 (patch) | |
| tree | 6a6fb7448c92a10684b0224a1492d86cc1485373 /include | |
| parent | eb1a1a2a0f0d0d55e38d212c2165c88c5697eb9e (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>
(cherry picked from commit 18f8a7056ac7b4677f4d99aac24ed2db44010140)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108730
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/zformat.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index b6d962d1fc98..222654004553 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -651,8 +651,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); @@ -691,10 +691,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() ) |