[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - chart2/source

[Markus Mohrhard]

 chart2/source/tools/NumberFormatterWrapper.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1b9f2f843723e45c0f5a8899b754f0dab01e5df6
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Mar 19 04:50:20 2014 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit d5580b252ad4cfea10422c044366c3c6c1ebed83)
    Reviewed-on: https://gerrit.libreoffice.org/8666
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index 1501532..4994215 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);
     }