svtools/source/svhtml/parhtml.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit 5199c8d02779e61c0c7f3a50b94e008648f50796 Author: Michael Stahl <[email protected]> AuthorDate: Tue Nov 16 14:28:15 2021 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Wed Nov 17 19:41:10 2021 +0100 ofz#40766 svtools, sw: HTMLParser: really stop inserting control chars 35d248cab1f0d4800f72abb5cb6afb56f40d9083 forgot to fix one place where control characters were in a presumed XML declaration. Another place looks missing where comments are handled, but it's not clear if these can be passed on to Writer. Revert the previous fix from commit b3325ef8cdfc2c82eec34e747106f75a9fccb7e4. Change-Id: I11ad13de9122533626e512ce0384051e3e5bd97f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125306 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit a7116b890ccd6dd1721413b4de6591a8057668ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125390 Tested-by: Michael Stahl <[email protected]> diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index dad59b28a2ab..8e0e64ec9bf3 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1069,6 +1069,7 @@ HtmlTokenId HTMLParser::GetNextToken_() aToken += sTmpBuffer.makeStringAndClear(); nNextCh = GetNextChar(); } while( '>' != nNextCh && '/' != nNextCh && !rtl::isAsciiWhiteSpace( nNextCh ) && + !linguistic::IsControlChar(nNextCh) && IsParserWorking() && !rInput.eof() ); if( !sTmpBuffer.isEmpty() ) @@ -1141,8 +1142,11 @@ HtmlTokenId HTMLParser::GetNextToken_() if( !bDone ) aToken += OUString(&nNextCh,1); } - else - aToken += OUString(&nNextCh,1); + else if (!linguistic::IsControlChar(nNextCh) + || nNextCh == '\r' || nNextCh == '\n' || nNextCh == '\t') + { + aToken += OUString(&nNextCh, 1); + } if( !bDone ) nNextCh = GetNextChar(); }
