commit 32eddb3f48fcea0a052401a8a5dc075c7847f1c5
author Caolán McNamara <caolanm@redhat.com> Tue Jul 01 12:50:45 2014 +0100
committer Miklos Vajna <vmiklos@collabora.co.uk> Wed Jul 02 08:18:31 2014 +0000
tree 8e4833519d8c3a6260877bf38cc4f050cdcb1e7d
parent 64a72ee3e0e5818cd36e96f67ca7543e8a366969

fix detection of Salesforce html

Change-Id: Ie777c253e221527cba8affaf766e2eddfc78c103
Reviewed-on: https://gerrit.libreoffice.org/10012
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

svtools/source/svhtml/parhtml.cxx

diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 54c1548..13a56c3 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1925,6 +1925,16 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader,

    sCmp = sCmp.toAsciiLowerCase();

    sal_Char c;
    sal_Int32 nPos;
    for (nPos = 0; nPos < sCmp.getLength(); ++nPos)
    {
        c = sCmp[nPos];
        if (c != ' ' && c != '\n' && c != '\t' && c != '\r' && c != '\f')
            break;
    }
    sCmp = sCmp.copy(nPos);

    // A HTML document must have a '<' in the first line
    sal_Int32 nStart = sCmp.indexOf('<');
    if (nStart == -1)
@@ -1932,8 +1942,6 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader,
    nStart++;

    // followed by arbitrary characters followed by a blank or '>'
    sal_Char c;
    sal_Int32 nPos;
    for( nPos = nStart; nPos < sCmp.getLength(); ++nPos )
    {
        if( '>'==(c=sCmp[nPos]) || HTML_ISSPACE(c) )