summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-07-01 12:20:45 +0200
committerAndras Timar <andras.timar@collabora.com>2019-07-14 00:19:04 +0200
commit8ff609067a3d2e712ec000d95084caa38a89dd2b (patch)
tree6073490a974a739f2c8fc6c0323d937bc9e4a7eb
parentdc0a4c443377782e2b012c3526f46452a8b43341 (diff)
MSForms: DOCX filter: handle export of empty date from control
* It's converted to date content control which is imported as text-based date control. * By now, we don't need to set a dummy text for empty date. Reviewed-on: https://gerrit.libreoffice.org/75458 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 6fd9987ae650bb2f0dd40aec95662a75c9a85598) Change-Id: I29b2a72e3ae2722c1d765c4fcb9bd13052619372 Reviewed-on: https://gerrit.libreoffice.org/75551 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 501302417305..3c58ae0076c3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5074,8 +5074,6 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
else
{
aContentText = xPropertySet->getPropertyValue("HelpText").get<OUString>();
- if(aContentText.isEmpty())
- aContentText = " "; // Need to write out something to have it imported by MS Word
if(sDateFormat.isEmpty())
sDateFormat = "dd/MM/yyyy"; // Need to set date format even if there is no date set
}