diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-07 17:50:00 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-07 19:06:13 +0100 |
| commit | a1aa7cfe28c80296d160528a62da33cc031101b0 (patch) | |
| tree | c650654e36819b729a6f7ec833d08608a2cb2313 | |
| parent | a64fcdde597514820873817e23eb5cd906cc5b92 (diff) | |
sw XHTML export: let reqif-xhtml= imply XHTML
An XML namespace for non-XHTML makes little sense.
Change-Id: I0ae1b2886a8d81be3c932c9e74aa91cd2e2fa447
Reviewed-on: https://gerrit.libreoffice.org/50905
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | sw/qa/extras/htmlexport/htmlexport.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index f329c3d4a79f..968533eb1973 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -55,8 +55,8 @@ private: setImportFilterOptions("xhtmlns=reqif-xhtml"); // Bypass filter detect. setImportFilterName("HTML (StarWriter)"); - // Export options. - setFilterOptions("XHTML,xhtmlns=reqif-xhtml"); + // Export options (implies XHTML). + setFilterOptions("xhtmlns=reqif-xhtml"); } else setFilterOptions(""); diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index ad6436de3912..385d41f58e01 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -196,6 +196,8 @@ void SwHTMLWriter::SetupFilterOptions(SfxMedium& rMedium) if (maNamespace == "reqif-xhtml") // XHTML is always just a fragment inside ReqIF. mbSkipHeaderFooter = true; + // XHTML namespace implies XHTML. + mbXHTML = true; } } } |