From 82d52b5af7b7cabc546acd90f0b77508ffae1f51 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 5 Jun 2013 11:22:33 +0200 Subject: bnc#820509 DOCX import: handle M.d.yyyy date format in w:sdt Change-Id: Iae233c24a9580ffc8ea4680276161a543171f63c (cherry picked from commit 58197c3692df0d0fccb5bc7abddaf6d9667565f6) --- writerfilter/source/dmapper/DomainMapper.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index d0b60d474fdc..c91c13997bbb 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3380,8 +3380,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType break; case NS_ooxml::LN_CT_SdtDate_dateFormat: { - if (sStringValue == "M/d/yyyy") - // See com/sun/star/awt/UnoControlDateFieldModel.idl, DateFormat; sadly there are no constants for this. + // See com/sun/star/awt/UnoControlDateFieldModel.idl, DateFormat; sadly there are no constants for this. + if (sStringValue == "M/d/yyyy" || sStringValue == "M.d.yyyy") + // Approximate with MM.dd.yyy m_pImpl->m_pSdtHelper->getDateFormat().reset(8); else { -- cgit v1.2.3