diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-29 11:34:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-29 14:44:37 +0200 |
commit | 9b25614939f7709e3d67949f49c4beeec0cdc534 (patch) | |
tree | c1e25fc743202c1fd8288ef5f8c0332203b1fc5c /desktop | |
parent | 6647a167400753df45dba788ed793d55ca0be9f8 (diff) |
loplugin:simplifybool in dbaccess..framework
Change-Id: I0d73bb7d8d3fde426edc0a10c0750758b68aceb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95099
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 4 | ||||
-rw-r--r-- | desktop/source/lib/init.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 513294535ce8..a76076e623f9 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -79,8 +79,8 @@ OUString OfficePipeId::operator () () OUString userPath; ::utl::Bootstrap::PathStatus aLocateResult = ::utl::Bootstrap::locateUserInstallation( userPath ); - if (!(aLocateResult == ::utl::Bootstrap::PATH_EXISTS || - aLocateResult == ::utl::Bootstrap::PATH_VALID)) + if (aLocateResult != ::utl::Bootstrap::PATH_EXISTS && + aLocateResult != ::utl::Bootstrap::PATH_VALID) { throw Exception("Extension Manager: Could not obtain path for UserInstallation.", nullptr); } diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 717a542a9f27..7f89463dc6aa 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -5043,7 +5043,7 @@ unsigned char* doc_renderFontOrientation(SAL_UNUSED_PARAMETER LibreOfficeKitDocu int nFontWidth = aRect.BottomRight().X() + 1; int nFontHeight = aRect.BottomRight().Y() + 1; - if (!(nFontWidth > 0 && nFontHeight > 0)) + if (nFontWidth <= 0 || nFontHeight <= 0) break; if (*pFontWidth > 0 && *pFontHeight > 0) |