From b2922c99f5fe1250e6a01390809736d29563fec9 Mon Sep 17 00:00:00 2001 From: Marco Cecchetti Date: Fri, 3 Oct 2014 15:45:17 +0200 Subject: [PATCH] html export: Fix export of checked checkbox and radiobutton. Change-Id: Ia77f9840df7508d96292aac63e65714a7892342f --- sw/CppunitTest_sw_htmlexport.mk | 1 + .../htmlexport/data/checkbox-radiobutton.doc | Bin 0 -> 35328 bytes sw/qa/extras/htmlexport/htmlexport.cxx | 20 ++++++++++++++++++ sw/source/filter/html/htmlforw.cxx | 5 ++++- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/htmlexport/data/checkbox-radiobutton.doc diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk index 475ce41884ba..23cdef152076 100644 --- a/sw/CppunitTest_sw_htmlexport.mk +++ b/sw/CppunitTest_sw_htmlexport.mk @@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\ canvas/source/factory/canvasfactory \ comphelper/util/comphelp \ configmgr/source/configmgr \ + dbaccess/util/dba \ embeddedobj/util/embobj \ filter/source/config/cache/filterconfig1 \ filter/source/storagefilterdetect/storagefd \ diff --git a/sw/qa/extras/htmlexport/data/checkbox-radiobutton.doc b/sw/qa/extras/htmlexport/data/checkbox-radiobutton.doc new file mode 100644 index 0000000000000000000000000000000000000000..17162a41012b723cf3df1de442e22e135f393361 GIT binary patch literal 35328 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 NYV!Hw{%@>-{{iL_t`z_P literal 0 HcmV?d00001 diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 1c479a01dd85..2db20efe992f 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -200,6 +200,26 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, "HTMLImage.odt") assertXPath(pDoc, "/html/body/p/a/font/img", "usemap", "#map1"); } +DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState, "checkbox-radiobutton.doc") +{ + htmlDocPtr pDoc = parseHtml(maTempFile); + CPPUNIT_ASSERT(pDoc); + + assertXPath(pDoc, "/html/body", 1); + assertXPath(pDoc, "/html/body/p[1]/input", "type", "checkbox"); + assertXPath(pDoc, "/html/body/p[1]/input", "checked", "checked"); + assertXPath(pDoc, "/html/body/p[2]/input", "type", "checkbox"); + assertXPathNoAttribute(pDoc, "/html/body/p[2]/input", "checked"); + assertXPath(pDoc, "/html/body/form/p[1]/input", "type", "checkbox"); + assertXPath(pDoc, "/html/body/form/p[1]/input", "checked", "checked"); + assertXPath(pDoc, "/html/body/form/p[2]/input", "type", "checkbox"); + assertXPathNoAttribute(pDoc, "/html/body/form/p[2]/input", "checked"); + assertXPath(pDoc, "/html/body/form/p[3]/input", "type", "radio"); + assertXPath(pDoc, "/html/body/form/p[3]/input", "checked", "checked"); + assertXPath(pDoc, "/html/body/form/p[4]/input", "type", "radio"); + assertXPathNoAttribute(pDoc, "/html/body/form/p[4]/input", "checked"); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 4fc3adf8620b..781704f5f20e 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -752,6 +752,9 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, TRISTATE_FALSE != *(sal_Int16*) aTmp.getValue() ) { sOptions += " " + OString(OOO_STRING_SVTOOLS_HTML_O_checked); + sOptions += "=\""; + sOptions += OString(OOO_STRING_SVTOOLS_HTML_O_checked); + sOptions += "\""; } aTmp = xPropSet->getPropertyValue( "RefValue" ); @@ -970,7 +973,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, sOut = "\""; } - sOut = sOptions; + sOut += " " + sOptions; if( TYPE_IMAGE == eType ) {