mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

the type in the Any is a util::Date and not a DateTime, fdo#74549

Browse Source 
Either that was always broken or it is a recent regression that
operator>>= does not convert from Date to DateTime.

Change-Id: Ic948224c139ed84b3fe006385fcafd6ce16c30f1
This commit is contained in:
Markus Mohrhard
2014-03-19 04:50:20 +01:00
committed by Markus Mohrhard
parent 8ff746e1ad
commit 22c7da0ca5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chart2/source/tools/NumberFormatterWrapper.cxx
View File

@@ -26,7 +26,7 @@
#include <svl/zformat.hxx> #include <svl/zformat.hxx>
#include <tools/color.hxx> #include <tools/color.hxx>
#include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/mslangid.hxx>
#include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Date.hpp>
namespace chart namespace chart
{ {
@@ -79,7 +79,7 @@ Date NumberFormatterWrapper::getNullDate() const
sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12; sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12;
Date aRet(nDay,nMonth,nYear); Date aRet(nDay,nMonth,nYear);
util::DateTime aUtilDate; util::Date aUtilDate;
if( m_aNullDate.hasValue() && (m_aNullDate >>= aUtilDate) ) if( m_aNullDate.hasValue() && (m_aNullDate >>= aUtilDate) )
{ {
aRet = Date(aUtilDate.Day,aUtilDate.Month,aUtilDate.Year); aRet = Date(aUtilDate.Day,aUtilDate.Month,aUtilDate.Year);
@@ -114,7 +114,7 @@ OUString NumberFormatterWrapper::getFormattedString( sal_Int32 nNumberFormatKey,
nMonth = pDate->GetMonth(); nMonth = pDate->GetMonth();
nDay = pDate->GetDay(); nDay = pDate->GetDay();
} // if ( pDate ) } // if ( pDate )
util::DateTime aNewNullDate; util::Date aNewNullDate;
m_aNullDate >>= aNewNullDate; m_aNullDate >>= aNewNullDate;
m_pNumberFormatter->ChangeNullDate(aNewNullDate.Day,aNewNullDate.Month,aNewNullDate.Year); m_pNumberFormatter->ChangeNullDate(aNewNullDate.Day,aNewNullDate.Month,aNewNullDate.Year);
} }