diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-05 11:22:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-05 13:03:03 +0200 |
| commit | 3ab23b633f540f690622a097334b669c85aee89f (patch) | |
| tree | f55b2feacf08ea4397c799f417816f2a257db58a /writerfilter | |
| parent | 73b023c77c73206df7f0373fc046d623f4c8ee6d (diff) | |
bnc#820509 DOCX import: handle M.d.yyyy date format in w:sdt
Change-Id: Iae233c24a9580ffc8ea4680276161a543171f63c
(cherry picked from commit 58197c3692df0d0fccb5bc7abddaf6d9667565f6)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 113f636eb67e..dc459bdd4632 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3318,8 +3318,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 { |