diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-28 18:10:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-29 08:37:10 +0200 |
| commit | 60362accc78fdff4213fa6c28bb4fbf00e06972f (patch) | |
| tree | 9afb29fc6349211636d5cba651c85415f32826cf /svtools/source/svhtml | |
| parent | b5fcdfd30c0a75b3365e42082f7af860381b2bc5 (diff) | |
XHTML import: <br></br> is one line break
But only for XHTML, HTML stays unchanged to be in sync with web
browsers.
Change-Id: I3a1cf6651dab565bafece68963acb112ae715cdd
Reviewed-on: https://gerrit.libreoffice.org/59727
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'svtools/source/svhtml')
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 14ed546ca9fe..c80fd00d77ed 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1120,10 +1120,11 @@ HtmlTokenId HTMLParser::GetNextToken_() // and there is an off token, return off token instead nRet = static_cast<HtmlTokenId>(static_cast<int>(nRet) + 1); } - else if( HtmlTokenId::LINEBREAK!=nRet ) + else if( HtmlTokenId::LINEBREAK!=nRet || !maNamespace.isEmpty()) { // and there is no off token, return unknown token. // (except for </BR>, that is treated like <BR>) + // No exception for XHTML, though. nRet = HtmlTokenId::UNKNOWNCONTROL_OFF; } } |