From 72ef2b5d9802c424dbb0810e0a72fae50d92b678 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 22 Nov 2017 14:12:34 +0100 Subject: Make loplugin:unnecessaryparen warn about (x) ? ... : ... after all ...which had been left out because "lots of our code uses this style, which I'm loathe to bulk-fix as yet", but now in "use std::unique_ptr" would have caused an otherwise innocent-looking code change to trigger a loplugin:unnecessaryparen warning for pFormat = (pGrfObj) ? ... (barring a change to ignoreAllImplicit in compilerplugins/clang/unnecessaryparen.cxx similar to that in "Make not warning about !! in loplugin:simplifybool consistent", which should also have caused the warning to disappear for the modified code, IIUC). Change-Id: I8bff0cc11bbb839ef06d07b8d9237f150804fec2 Reviewed-on: https://gerrit.libreoffice.org/45088 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sw/source/uibase/uno/unoatxt.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sw/source/uibase/uno/unoatxt.cxx') diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 9091fb7208a6..28c2c7f85454 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -300,12 +300,12 @@ static bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTe SwNodeIndex aIdx( rNds.GetEndOfContent(), -1 ); SwContentNode * pNd = aIdx.GetNode().GetContentNode(); - SwPosition aPos(aIdx, SwIndex(pNd, (pNd) ? pNd->Len() : 0)); + SwPosition aPos(aIdx, SwIndex(pNd, pNd ? pNd->Len() : 0)); bool bRet = false; pInsDoc->getIDocumentFieldsAccess().LockExpFields(); { - SwDoc *const pDoc((pxCursor) ? pxCursor->GetDoc() : &pxRange->GetDoc()); + SwDoc *const pDoc(pxCursor ? pxCursor->GetDoc() : &pxRange->GetDoc()); SwPaM aPam(pDoc->GetNodes()); SwPaM * pPam(nullptr); if(pxCursor) -- cgit