diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-23 22:25:26 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-06-04 13:04:31 +0200 |
| commit | 11cbcb8b08b540b144a5df744e9fba0b6ba8144a (patch) | |
| tree | 373d7f820571514a42d12ffe44df1f7961cff1ff /svtools/source/svhtml | |
| parent | 1f967b487f7fa73dd0ae40edf02a02c94c2b78be (diff) | |
Bug 36390 <title /> breaks html filter fixed
Diffstat (limited to 'svtools/source/svhtml')
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 2afe118d3c41..4681131fba9d 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -372,7 +372,7 @@ int HTMLParser::FilterToken( int nToken ) { case sal_Unicode(EOF): nToken = 0; - break; // nicht verschicken + break; // don't pass case HTML_HEAD_OFF: bIsInBody = sal_True; @@ -393,7 +393,7 @@ int HTMLParser::FilterToken( int nToken ) case HTML_HTML_OFF: nToken = 0; bReadPRE = bReadListing = bReadXMP = sal_False; - break; // HTML_ON wurde auch nicht verschickt ! + break; // HTML_ON hasn't been passed either ! case HTML_PREFORMTXT_ON: StartPRE(); @@ -1223,12 +1223,10 @@ int HTMLParser::_GetNextToken() { ScanText( '>' ); - // fdo#34666: closing "/>"?: - // return HTML_UNKNOWNCONTROL_OFF instead of - // HTML_UNKNOWNCONTROL_ON + // fdo#34666 fdo#36080 fdo#36390: closing "/>"?: + // return HTML_<TOKEN>_OFF instead of HTML_<TOKEN>_ON if (aToken.Len() >= 1 && '/' == aToken.GetChar(aToken.Len()-1)) { - if (HTML_UNKNOWNCONTROL_ON == nRet) - nRet = HTML_UNKNOWNCONTROL_OFF; + nRet += 1; // HTML_<TOKEN>_ON -> HTML_<TOKEN>_OFF; } if( sal_Unicode(EOF) == nNextCh && rInput.IsEof() ) { @@ -1351,7 +1349,6 @@ int HTMLParser::_GetNextToken() bReadStyle = sal_False; break; } - } } break; @@ -1648,7 +1645,7 @@ int HTMLParser::FilterPRE( int nToken ) { xub_StrLen nSpaces = sal::static_int_cast< xub_StrLen >( 8 - (nPre_LinePos % 8)); - DBG_ASSERT( !aToken.Len(), "Wieso ist das Token nicht leer?" ); + DBG_ASSERT( !aToken.Len(), "Why is the token not empty?" ); aToken.Expand( nSpaces, ' ' ); nPre_LinePos += nSpaces; nToken = HTML_TEXTTOKEN; |