diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-10 12:35:32 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-10 16:06:02 +0000 |
| commit | 68e825d8c405b9cba553e7136f7e1295540df70d (patch) | |
| tree | 0aab50f195605288d00a1a6ece5565139205b085 | |
| parent | 7ea64977f1318d14bda60bd3bd042b17ee6d77a8 (diff) | |
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 <thb@documentfoundation.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit 0f890da1fd6282759c53c998566a809c9353b775)
Reviewed-on: https://gerrit.libreoffice.org/7025
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | editeng/source/items/flditem.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index af68b5319173..47dfaa781b20 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); |