sw/source/filter/html/htmlatr.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 9d04960703b24c6650a1d324937ac3f972d9b57b Author: Stephan Bergmann <stephan.bergm...@allotropia.de> AuthorDate: Thu Jan 9 20:50:12 2025 +0100 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Wed Jan 15 12:40:28 2025 +0100 Fix SwHTMLTextCollOutputInfo::HasParaToken, check for 'p', not 'P' This had apparently been broken by 73e3aafa990168aa532fa7b81fc4de8f455b10e1 "convert HTML tags/attributes to lowercase for html export" turning the various OOO_STRING_SVTOOLS_HTML_... defines from upper- to lowercase, but leaving that single 'P' alone. (Though it's unclear whether this makes much of a difference in practice. At least none of the `make check` tests apparently change their behavior due to this.) Change-Id: I1411b0dd7d82237fccffdff27e4982089a1d64b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180035 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de> (cherry picked from commit 440ef8f32f3f7deae2c9f9910bd2750a504afd54) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180179 Reviewed-by: Michael Stahl <michael.st...@allotropia.de> diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index d71b97fb281a..cc9b68354002 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -218,7 +218,7 @@ struct SwHTMLTextCollOutputInfo bOutDiv( false ) {} - bool HasParaToken() const { return aToken.getLength()==1 && aToken[0]=='P'; } + bool HasParaToken() const { return aToken == OOO_STRING_SVTOOLS_HTML_parabreak; } bool ShouldOutputToken() const { return bOutPara || !HasParaToken(); } };