svtools/source/table/cellvalueconversion.cxx | 2 +-
xmloff/source/core/xmluconv.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d5c8f58aa4485ed26827b69b94a195c78aaab6db
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Wed Jul 26 21:09:02 2017 +0200
correct some Date related types
signature of Date and Date::DateToDays is
(sal_uInt16 d, sal_uInt16 m, sal_Int16 y)
same types as css::util::Date members Day, Month and Year
Change-Id: Ifa35574d2d335f7bf816dd5209988f4eaf7c5ac2
Reviewed-on: https://gerrit.libreoffice.org/40462
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svtools/source/table/cellvalueconversion.cxx
b/svtools/source/table/cellvalueconversion.cxx
index a3c1d12062e0..2f28c3ddc732 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -60,7 +60,7 @@ namespace svt
namespace
{
- double lcl_convertDateToDays( long const i_day, long const i_month,
long const i_year )
+ double lcl_convertDateToDays( sal_uInt16 const i_day, sal_uInt16 const
i_month, sal_Int16 const i_year )
{
long const nNullDateDays = ::Date::DateToDays( 1, 1, 1900 );
long const nValueDateDays = ::Date::DateToDays( i_day, i_month,
i_year );
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 7aaa01c25d8e..6e8670d4d4d2 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -438,7 +438,7 @@ bool SvXMLUnitConverter::convertDateTime( double& fDateTime,
if (bSuccess)
{
const Date aTmpNullDate(aTempNullDate.Day, aTempNullDate.Month,
aTempNullDate.Year);
- const Date aTempDate((sal_uInt16)aDateTime.Day,
(sal_uInt16)aDateTime.Month, (sal_uInt16)aDateTime.Year);
+ const Date aTempDate(aDateTime.Day, aDateTime.Month, aDateTime.Year);
const sal_Int32 nTage = aTempDate - aTmpNullDate;
double fTempDateTime = nTage;
double Hour = aDateTime.Hours;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
