[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Stephan Bergmann]

 sw/source/core/unocore/unofield.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69ad547bf476a54326d772f2b6b832ad78eed486
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 30 11:19:37 2016 +0200

    Fix tools/date.hxx Date vs. css::uno::Date mismatch
    
    ...that was there ever since at least 84a3db80b4fd66c6854b3135b5f69b61fd828e62
    "initial import".  None of the "make check" code appears to trigger this code
    path.
    
    Change-Id: Ic85b2ef4cf0a0ad06b467558e823cfa4ee31a08c
    (cherry picked from commit 46a987fe08c6f7d20da437eed621d670ce44aea7)
    Reviewed-on: https://gerrit.libreoffice.org/25980
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index beea48c..89e5f17 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2459,7 +2459,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                 aRet <<= m_pImpl->m_pProps->bBool4;
                 break;
             case FIELD_PROP_DATE :
-                aRet.setValue(&m_pImpl->m_pProps->aDate, ::cppu::UnoType<util::Date>::get());
+                aRet <<= m_pImpl->m_pProps->aDate.GetUNODate();
                 break;
             case FIELD_PROP_USHORT1:
                 aRet <<= static_cast<sal_Int16>(m_pImpl->m_pProps->nUSHORT1);