[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - filter/source

[Miklos Vajna]

 filter/source/config/fragments/types/generic_HTML.xcu |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f937a432c2351852e8b237c6e11dd9e43a2b28c9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 13 11:13:40 2017 +0100

    Related: tdf#114428 filter: associate .xhtml with HTML import
    
    Since there is no XHTML import; and this way the expensive "deep"
    detection (that calls into all the DLP libs, etc) can be avoided.
    
    Times for a hello world input: 56 -> 23 ms is spent in
    Desktop::loadComponentFromURL() (41% of original).
    
    Change-Id: Ia2dec3837cf0c548ae2c5a0ca4d47a57a6cbb92a
    Reviewed-on: https://gerrit.libreoffice.org/46387
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit 14daba5bd0ba64ff53ad98de7a84537ff03024ea)
    Reviewed-on: https://gerrit.libreoffice.org/47588
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/config/fragments/types/generic_HTML.xcu b/filter/source/config/fragments/types/generic_HTML.xcu
index b00b048d3842..b29ba333aded 100644
--- a/filter/source/config/fragments/types/generic_HTML.xcu
+++ b/filter/source/config/fragments/types/generic_HTML.xcu
@@ -18,7 +18,7 @@
     <node oor:name="generic_HTML" oor:op="replace" >
         <prop oor:name="DetectService"><value>com.sun.star.comp.filters.PlainTextFilterDetect</value></prop>
         <prop oor:name="URLPattern"><value>private:factory/swriter/web*</value></prop>
-        <prop oor:name="Extensions"><value>html htm</value></prop>
+        <prop oor:name="Extensions"><value>html htm xhtml</value></prop>
         <prop oor:name="MediaType"><value>text/html</value></prop>
         <prop oor:name="Preferred"><value>false</value></prop>
         <prop oor:name="PreferredFilter"><value>HTML</value></prop>