From d5580b252ad4cfea10422c044366c3c6c1ebed83 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 19 Mar 2014 04:50:20 +0100 Subject: the type in the Any is a util::Date and not a DateTime, fdo#74549 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Either that was always broken or it is a recent regression that operator>>= does not convert from Date to DateTime. Change-Id: Ic948224c139ed84b3fe006385fcafd6ce16c30f1 (cherry picked from commit 22c7da0ca5438b69165609db2a1ef219aa167dc2) Reviewed-on: https://gerrit.libreoffice.org/8652 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- chart2/source/tools/NumberFormatterWrapper.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 150153283b40..4994215d58ab 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace chart { @@ -79,7 +79,7 @@ Date NumberFormatterWrapper::getNullDate() const sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12; Date aRet(nDay,nMonth,nYear); - util::DateTime aUtilDate; + util::Date aUtilDate; if( m_aNullDate.hasValue() && (m_aNullDate >>= aUtilDate) ) { aRet = Date(aUtilDate.Day,aUtilDate.Month,aUtilDate.Year); @@ -114,7 +114,7 @@ OUString NumberFormatterWrapper::getFormattedString( sal_Int32 nNumberFormatKey, nMonth = pDate->GetMonth(); nDay = pDate->GetDay(); } // if ( pDate ) - util::DateTime aNewNullDate; + util::Date aNewNullDate; m_aNullDate >>= aNewNullDate; m_pNumberFormatter->ChangeNullDate(aNewNullDate.Day,aNewNullDate.Month,aNewNullDate.Year); } -- cgit v1.2.3