From d6c32cffb5cc81989b4bb4a221a152bbe607bd98 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 19 Apr 2020 09:07:27 +0200 Subject: loplugin:simplifybool extend to expression like !(a < b || c > d) mostly to catch stuff from the flatten work, but I think this looks good in general Change-Id: I7be5b7bcf1f3d9f980c748ba20793965cef957e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92493 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sdext/source/pdfimport/wrapper/wrapper.cxx | 2 +- sdext/source/presenter/PresenterSlideSorter.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sdext') diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index e850e5a6c7b8..aba48b11a053 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -1106,7 +1106,7 @@ bool xpdf_ImportFromFile(const OUString& rURL, for (;;) { nRes = aBuffering.read(&aChar, 1, &nBytesRead); - if (osl_File_E_None != nRes || nBytesRead != 1 || !(aChar == '\n' || aChar == '\r') ) + if (osl_File_E_None != nRes || nBytesRead != 1 || (aChar != '\n' && aChar != '\r') ) break; } if ( osl_File_E_None != nRes ) diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 681eb55a1cc6..029b0e05f3b0 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -497,7 +497,7 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r const geometry::RealPoint2D aPosition(rTemp.X, rEvent.Y); const sal_Int32 nSlideIndex (mpLayout->GetSlideIndexForPosition(aPosition)); - if (!(nSlideIndex == mnSlideIndexMousePressed && mnSlideIndexMousePressed >= 0)) + if (nSlideIndex != mnSlideIndexMousePressed || mnSlideIndexMousePressed < 0) return; switch (rEvent.ClickCount) -- cgit