summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-06-05 11:22:33 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-06-05 13:04:19 +0200
commit82d52b5af7b7cabc546acd90f0b77508ffae1f51 (patch)
treee7fc0d0a1283e48f4f8a6618bab03aca28b5cd3c /writerfilter
parent5e9eeafc4364f63a353d3a6099db4a73519c4dd8 (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.cxx5
1 files changed, 3 insertions, 2 deletions
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
{