diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-29 22:53:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-30 07:14:17 +0100 |
| commit | 1136ed6c5112018af08f8ac703070cc195389b40 (patch) | |
| tree | 149b884147725a6df32e35301eb40e657121aa86 /forms | |
| parent | b5d8a5f830832f04d192f1351d8e523a2ef0042a (diff) | |
Fix Plugin::containsPreprocessingConditionalInclusion
...which had been broken since dfc0dc4801707b2d8080af1540625b43bd463e17
"loplugin:casttovoid: fix containsPreprocessingConditionalInclusion()", and,
when range.getEnd() was a macro loc, would typically have wandered off past
the end of the intended range, until it would have encountered some #if etc.
and erroneously returned true. Fixed the fallout across the code base.
While at it, added a clarifying comment and made the "lexing fails" cases that
should never happen fail with a fatal error in debug mode.
Change-Id: Ieff44548384426d7716b6fc6c836c9069d878729
Reviewed-on: https://gerrit.libreoffice.org/81721
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/solar/control/navtoolbar.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 2e8f82aff31d..a512c54a0793 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -57,8 +57,7 @@ namespace frm OUString getLabelString(const char* pResId) { - OUString sLabel( " " ); - sLabel += FRM_RES_STRING(pResId); + OUString sLabel( " " + FRM_RES_STRING(pResId) ); sLabel += " "; return sLabel; } |