diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-03 14:43:54 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-12 06:11:25 +0200 |
| commit | 9c2feb75a6104d4376cccb157244dd7f6e88968a (patch) | |
| tree | dfdcf540750ae743911bcee59156e13bcdea51fc /writerfilter | |
| parent | 9e007eb2b0ab44b436da9d00559150cc4fa37dc5 (diff) | |
MSForms: DOCX filter: handle date formats with quotation marks.
Change-Id: I61cc6d47200acdd55f147b4f1829330dec8562a0
Reviewed-on: https://gerrit.libreoffice.org/75454
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/SdtHelper.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index c55ceaec0d65..5ba2126bc808 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -122,7 +122,10 @@ void SdtHelper::createDateContentControl() uno::Reference<container::XNameContainer> xNameCont = xFormField->getParameters(); if(xNameCont.is()) { - xNameCont->insertByName(ODF_FORMDATE_DATEFORMAT, uno::makeAny(m_sDateFormat.makeStringAndClear())); + OUString sDateFormat = m_sDateFormat.makeStringAndClear(); + // Replace quotation mark used for marking static strings in date format + sDateFormat = sDateFormat.replaceAll("'", "\""); + xNameCont->insertByName(ODF_FORMDATE_DATEFORMAT, uno::makeAny(sDateFormat)); xNameCont->insertByName(ODF_FORMDATE_DATEFORMAT_LANGUAGE, uno::makeAny(m_sLocale.makeStringAndClear())); OUString sDate = m_sDate.makeStringAndClear(); if(!sDate.isEmpty()) |