[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - editeng/source

[Michael Stahl]

 editeng/source/items/flditem.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f890da1fd6282759c53c998566a809c9353b775
Author: Michael Stahl <mst...@redhat.com>
Date:   Tue Dec 10 12:35:32 2013 +0100

    fdo#70278: editeng: fix Time fields in Impress
    
    Apparenty an uninitialized SvxTimeField is created instead of the
    SvxExtTimeField that is needed to preserve the value and format.
    
    (regression from ee5fc5d25fe102c30daf7d181b8181d40b85a4f3)
    
    (cherry picked from commit 1235e694c21f6e3e000e24a176123c386ea91df1)
    
    Conflicts:
        editeng/source/items/flditem.cxx
    
    Change-Id: I36b16af0c143e8b5451a1925806756492dc2334e
    Reviewed-on: https://gerrit.libreoffice.org/7022
    Reviewed-by: Thorsten Behrens <t...@documentfoundation.org>
    Reviewed-by: Kohei Yoshida <libreoff...@kohei.us>
    Tested-by: Kohei Yoshida <libreoff...@kohei.us>

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index af68b53..47dfaa7 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -82,7 +82,7 @@ SvxFieldData* SvxFieldData::Create(const 
uno::Reference<text::XTextContent>& xTe
                 return pData;
             }
 
-            if (nFieldType != text::textfield::Type::TIME && nFieldType != 
text::textfield::Type::DATE)
+            if (nFieldType != text::textfield::Type::TIME)
             {
                 util::DateTime aDateTime = 
xPropSet->getPropertyValue(UNO_TC_PROP_DATE_TIME).get<util::DateTime>();
                 Time aTime(aDateTime.Hours, aDateTime.Minutes, 
aDateTime.Seconds, aDateTime.NanoSeconds);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits