diff options
| author | Eike Rathke <erack@redhat.com> | 2020-10-13 21:41:45 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-01-06 11:47:06 +0100 |
| commit | 44d17f8feca372acd41142d1b607d3360282bf30 (patch) | |
| tree | dc07fc8c6bbb8a336f2085cee39b3302bfd390a5 /include | |
| parent | c82bb0297ea0dbba77823230ed36b81a39e8cbab (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 089a4b0e48e6..3dbc0f925ceb 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() ) |