diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:09:41 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:09:41 +0100 |
| commit | 11792080f12ef07f8d6a0334bdb93cf024905829 (patch) | |
| tree | 2a58a796a8c87ca25b3ce1e448329ea6f9d858e2 /svtools/source | |
| parent | 4fdd55226d2972e3a256426db3122ac23b0615c6 (diff) | |
| parent | 6996c17ac5f276f46cf6f5da1f70ee18c318fae1 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index dbaae52db17e..eaada2b8eb9a 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1252,6 +1252,14 @@ int HTMLParser::_GetNextToken() if( '>' != nNextCh && IsParserWorking() ) { ScanText( '>' ); + + // fdo#34666: closing "/>"?: + // return HTML_UNKNOWNCONTROL_OFF instead of + // HTML_UNKNOWNCONTROL_ON + if (aToken.Len() >= 1 && '/' == aToken.GetChar(aToken.Len()-1)) { + if (HTML_UNKNOWNCONTROL_ON == nRet) + nRet = HTML_UNKNOWNCONTROL_OFF; + } if( sal_Unicode(EOF) == nNextCh && rInput.IsEof() ) { // zurueck hinter die < gehen und dort neu |