From 9c2feb75a6104d4376cccb157244dd7f6e88968a Mon Sep 17 00:00:00 2001 From: Tamás Zolnai Date: Wed, 3 Jul 2019 14:43:54 +0200 Subject: MSForms: DOCX filter: handle date formats with quotation marks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I61cc6d47200acdd55f147b4f1829330dec8562a0 Reviewed-on: https://gerrit.libreoffice.org/75454 Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai --- writerfilter/source/dmapper/SdtHelper.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'writerfilter') 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 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()) -- cgit