[Libreoffice-commits] core.git: filter/source

[Maxim Monastirsky]

 filter/source/htmlfilterdetect/filterdetect.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7a044d08572244931b16f24f3f8cc83111b039f9
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Feb 17 11:40:34 2014 +0200

    fdo#74595 Make HTML detection to follow specs
    
    See http://www.w3.org/TR/html-markup/documents.html#conformant-html
    
    Change-Id: Id2835f20baad20bcb874df5e6f35a189c320367b
    Reviewed-on: https://gerrit.libreoffice.org/8079
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/htmlfilterdetect/filterdetect.cxx b/filter/source/htmlfilterdetect/filterdetect.cxx
index 140912d..9e5350d 100644
--- a/filter/source/htmlfilterdetect/filterdetect.cxx
+++ b/filter/source/htmlfilterdetect/filterdetect.cxx
@@ -53,7 +53,7 @@ bool isHTMLStream(const OString& aStreamHeader)
     for ( i = 0; i < nLength; ++i, ++pHeader )
     {
         char c = *pHeader;
-        if ( c == ' ' || c == '\n' || c == '\t' )
+        if ( c == ' ' || c == '\n' || c == '\t' || c == '\r' || c == '\f' )
         {
             if ( dp == TagOpened )
                 return false; // Invalid: Should start with a tag name
@@ -76,8 +76,8 @@ bool isHTMLStream(const OString& aStreamHeader)
         }
         else if ( c == '!' )
         {
-            if ( i == 1 && dp == TagOpened )
-                return true; // "<!" at the very beginning of the file
+            if ( dp == TagOpened )
+                return true; // "<!" - DOCTYPE or comments block
             else
                 return false; // Invalid: '!' before '<' or inside tag name
         }