[Libreoffice-commits] core.git: sw/qa sw/source

[Miklos Vajna]

 sw/qa/extras/htmlexport/htmlexport.cxx |    4 ++--
 sw/source/filter/html/wrthtml.cxx      |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a1aa7cfe28c80296d160528a62da33cc031101b0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Mar 7 17:50:00 2018 +0100

    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 at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

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;
         }
     }
 }