desktop/win32/source/loader.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9d79fb32b76762394f68f80c1cd3dec8864f4d17
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 30 14:30:10 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 30 16:25:51 2019 +0100
-Werror,-Wlogical-op-parentheses (clang-cl)
Change-Id: Ia505271b395588647a2e0b3db449000d110cb395
Reviewed-on: https://gerrit.libreoffice.org/67139
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx
index 3960dd2c6f1c..d86a3b692ba4 100644
--- a/desktop/win32/source/loader.cxx
+++ b/desktop/win32/source/loader.cxx
@@ -89,12 +89,12 @@ void extendLoaderEnvironment(WCHAR * binPath, WCHAR *
iniDirectory) {
*nameEnd++ = *p;
}
if (!(nameEnd - name >= 4 && nameEnd[-4] == L'.' &&
- ((nameEnd[-3] == L'E' || nameEnd[-3] == L'e') &&
- (nameEnd[-2] == L'X' || nameEnd[-2] == L'x') &&
- (nameEnd[-1] == L'E' || nameEnd[-1] == L'e') ||
- (nameEnd[-3] == L'C' || nameEnd[-3] == L'c') &&
- (nameEnd[-2] == L'O' || nameEnd[-2] == L'o') &&
- (nameEnd[-1] == L'M' || nameEnd[-1] == L'm'))))
+ (((nameEnd[-3] == L'E' || nameEnd[-3] == L'e') &&
+ (nameEnd[-2] == L'X' || nameEnd[-2] == L'x') &&
+ (nameEnd[-1] == L'E' || nameEnd[-1] == L'e')) ||
+ ((nameEnd[-3] == L'C' || nameEnd[-3] == L'c') &&
+ (nameEnd[-2] == L'O' || nameEnd[-2] == L'o') &&
+ (nameEnd[-1] == L'M' || nameEnd[-1] == L'm')))))
{
*nameEnd = L'.';
nameEnd += 4;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
