From 4250b25c6ae361359300ab6ccde27230f8e01039 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 6 Jul 2017 14:49:15 +0200
Subject: teach unnecessaryparen loplugin about identifiers

Change-Id: I5710b51e53779c222cec0bf08cd34bda330fec4b
Reviewed-on: https://gerrit.libreoffice.org/39737
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 dbaccess/source/ui/app/AppController.cxx              |  4 ++--
 dbaccess/source/ui/misc/DExport.cxx                   | 10 +++++-----
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |  2 +-
 dbaccess/source/ui/querydesign/querycontroller.cxx    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'dbaccess/source')

diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 9532e54bd133..ef7070e2b720 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -390,8 +390,8 @@ void SAL_CALL OApplicationController::disposing()
                     // add to recent document list
                     if ( aURL.GetProtocol() == INetProtocol::File )
                         Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::DecodeMechanism::NONE ),
-                                                              (pFilter) ? pFilter->GetMimeType() : OUString(),
-                                                              (pFilter) ? pFilter->GetServiceName() : OUString() );
+                                                              pFilter ? pFilter->GetMimeType() : OUString(),
+                                                              pFilter ? pFilter->GetServiceName() : OUString() );
                 }
             }
 
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 45b514eed4d2..1e8cc8d585e7 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -297,9 +297,9 @@ void ODatabaseExport::insertValueIntoColumn()
         if(pField)
         {
             sal_Int32 nNewPos = m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos;
-            OSL_ENSURE((nNewPos) < static_cast<sal_Int32>(m_vColumns.size()),"m_vColumns: Illegal index for vector");
+            OSL_ENSURE(nNewPos < static_cast<sal_Int32>(m_vColumns.size()),"m_vColumns: Illegal index for vector");
 
-            if ( (nNewPos) < static_cast<sal_Int32>(m_vColumns.size() ) )
+            if ( nNewPos < static_cast<sal_Int32>(m_vColumns.size() ) )
             {
                 sal_Int32 nPos = m_vColumns[nNewPos].first;
                 if ( nPos != COLUMN_POSITION_NOT_FOUND )
@@ -556,7 +556,7 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo
         Reference< XNumberFormats >         xFormats = xSupplier->getNumberFormats();
         TColumnVector::const_iterator aIter = _pList->begin();
         TColumnVector::const_iterator aEnd = _pList->end();
-        for(sal_Int32 i= 0;aIter != aEnd && (i) < static_cast<sal_Int32>(m_vNumberFormat.size()) && (i) < static_cast<sal_Int32>(m_vColumnSize.size()) ;++aIter,++i)
+        for(sal_Int32 i= 0;aIter != aEnd && i < static_cast<sal_Int32>(m_vNumberFormat.size()) && i < static_cast<sal_Int32>(m_vColumnSize.size()) ;++aIter,++i)
         {
             sal_Int32 nDataType;
             sal_Int32 nLength(0),nScale(0);
@@ -761,8 +761,8 @@ void ODatabaseExport::adjustFormat()
     if ( !m_sTextToken.isEmpty() )
     {
         sal_Int32 nNewPos = m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos;
-        OSL_ENSURE((nNewPos) < static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for vector");
-        if ( (nNewPos) < static_cast<sal_Int32>(m_vColumns.size()) )
+        OSL_ENSURE(nNewPos < static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for vector");
+        if ( nNewPos < static_cast<sal_Int32>(m_vColumns.size()) )
         {
             sal_Int32 nColPos = m_vColumns[nNewPos].first;
             if( nColPos != sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND))
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 5eb1e3694875..7ad2edae340e 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1512,7 +1512,7 @@ void OSelectionBrowseBox::InsertColumn(const OTableFieldDescRef& pEntry, sal_uIn
         ColumnMoved(pEntry->GetColumnId(),false);
     }
 
-    if ( pEntry->GetFunctionType() & (FKT_AGGREGATE) )
+    if ( pEntry->GetFunctionType() & FKT_AGGREGATE )
     {
         OUString sFunctionName = pEntry->GetFunction();
         if ( GetFunctionName(sal_uInt32(-1),sFunctionName) )
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 1f7647c1d994..f2a3300374e0 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1400,7 +1400,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs)
     bool bNew = false;
     try
     {
-        bNew = ( _bSaveAs )
+        bNew =  _bSaveAs
             || ( !xElements->hasByName( m_sName ) );
 
         Reference<XPropertySet> xQuery;
-- 
cgit