diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-19 04:50:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-21 11:20:28 +0000 |
| commit | 1b9f2f843723e45c0f5a8899b754f0dab01e5df6 (patch) | |
| tree | 2195551a1526b3e394bc0a9e4f384dc7caca8751 | |
| parent | 4a1f7ca884f36703e202122122e0fc6cf921de2d (diff) | |
the type in the Any is a util::Date and not a DateTime, fdo#74549
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d5580b252ad4cfea10422c044366c3c6c1ebed83)
Reviewed-on: https://gerrit.libreoffice.org/8666
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | chart2/source/tools/NumberFormatterWrapper.cxx | 6 |
1 files 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 <svl/zformat.hxx> #include <tools/color.hxx> #include <i18nlangtag/mslangid.hxx> -#include <com/sun/star/util/DateTime.hpp> +#include <com/sun/star/util/Date.hpp> 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); } |