[Libreoffice-commits] core.git: sc/source

Stephan Bergmann sbergman at redhat.com
Thu Jan 18 03:31:03 UTC 2018


 sc/source/ui/unoobj/dapiuno.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 110025afab3946586826b18a316416fba41dc1f6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 16 15:27:00 2018 +0100

    Odd conversion double -> sal_Int32 -> double
    
    ...which had been introduced into that assignment in
    ScDataPilotFieldObj::createDateGroup with
    7dd50f9ec124f2666dcfd1fd8bb02a1335a360ac "CWS-TOOLING: integrate CWS dr67", but
    for no documented purpose.  So lets assume the truncation is for a reason, and
    replace it with a call to std::trunc.
    
    Change-Id: I2dfd4c0f5966e9ab294ecd5b3424fece2ea70daa
    Reviewed-on: https://gerrit.libreoffice.org/47995
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 51749deec887..645d5f416e74 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <algorithm>
+#include <cmath>
+
 #include <svl/hint.hxx>
 #include <vcl/svapp.hxx>
 
@@ -2704,7 +2706,7 @@ Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( con
         aInfo.mbAutoEnd = rInfo.HasAutoEnd;
         aInfo.mfStart = rInfo.Start;
         aInfo.mfEnd = rInfo.End;
-        aInfo.mfStep = static_cast< sal_Int32 >( rInfo.Step );
+        aInfo.mfStep = std::trunc( rInfo.Step );
 
         // create a local copy of the entire save data (will be written back below)
         ScDPSaveData aSaveData = *pDPObj->GetSaveData();


More information about the Libreoffice-commits mailing list