diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-04 11:20:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-05 07:49:30 +0100 |
commit | e4472d3c139294499f4c0caeebd9d4e995958eb0 (patch) | |
tree | 3e62a6530f8b758dddab18981ee38cc76ecaef9e /dbaccess/source | |
parent | 126e5a4d5b1d6c7ba5b313786793a38f99488b33 (diff) |
loplugin:unnecessaryparen include more assignments
Change-Id: I9fb8366634b31230b732dd38a98f800075529714
Reviewed-on: https://gerrit.libreoffice.org/64510
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/core/api/RowSetBase.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSetCache.cxx | 10 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableUndo.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index fa8cd6ab311e..84d18d8aae34 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -233,7 +233,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) OSL_ENSURE( pTemp != reinterpret_cast<void*>(0xfeeefeee),"HALT!" ); } OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow < m_pCache->getEnd() && aCacheIter != m_pCache->m_aCacheIterators.end(),"Invalid iterator set for currentrow!"); - ORowSetRow rRow = (*m_aCurrentRow); + ORowSetRow rRow = *m_aCurrentRow; OSL_ENSURE(rRow.is() && static_cast<sal_uInt16>(columnIndex) < (rRow->get()).size(),"Invalid size of vector!"); #endif return ((*m_aCurrentRow)->get())[m_nLastColumnIndex = columnIndex]; @@ -1038,7 +1038,7 @@ void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow m_bIsInsertRow = false; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); #if OSL_DEBUG_LEVEL > 0 - ORowSetRow rRow = (*m_aCurrentRow); + ORowSetRow rRow = *m_aCurrentRow; OSL_ENSURE(rRow.is() ,"Invalid size of vector!"); #endif diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index d4443a17ee6a..e7f5b66a6171 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -393,12 +393,12 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize) if ( !aCacheIter->second.pRowSet->isInsertRow() /*&& aCacheIter->second.aIterator != m_pMatrix->end()*/ && !m_bModified ) { - ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin()); + ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin(); aPositions.push_back(nDist); aCacheIterToChange[aCacheIter->first] = true; } } - sal_Int32 nKeyPos = (m_aMatrixIter - m_pMatrix->begin()); + sal_Int32 nKeyPos = m_aMatrixIter - m_pMatrix->begin(); m_pMatrix->resize(_nSize); if ( nKeyPos < _nSize ) @@ -919,7 +919,7 @@ void ORowSetCache::moveWindow() if ( !aCacheIter->second.pRowSet->isInsertRow() && aCacheIter->second.aIterator != m_pMatrix->end() ) { - const ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin()); + const ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin(); if ( nDist >= nOverlapSize ) { // That's from outside the overlap area; invalidate iterator. @@ -1458,7 +1458,7 @@ void ORowSetCache::rotateCacheIterator(ORowSetMatrix::difference_type _nDist) if ( !aCacheIter->second.pRowSet->isInsertRow() && aCacheIter->second.aIterator != m_pMatrix->end()) { - ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin()); + ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin(); if(nDist < _nDist) { aCacheIter->second.aIterator = m_pMatrix->end(); @@ -1497,7 +1497,7 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo if(!m_aInsertRow->is()) *m_aInsertRow = new ORowSetValueVector(m_xMetaData->getColumnCount()); - (*(*m_aInsertRow)) = (*(*_rOriginalRow)); + (*(*m_aInsertRow)) = *(*_rOriginalRow); // we don't unbound the bookmark column ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin(); ORowSetValueVector::Vector::const_iterator aEnd = (*m_aInsertRow)->get().end(); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 51369f8d4ce9..aa1ca17714c3 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -354,7 +354,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) auto aIter = m_vTableConnection.rbegin(); while(aIter != m_vTableConnection.rend() && bRemove) { - VclPtr<OTableConnection>& rTabConn = (*aIter); + VclPtr<OTableConnection>& rTabConn = *aIter; if ( (pData == rTabConn->GetData()->getReferencingTable()) || (pData == rTabConn->GetData()->getReferencedTable()) diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index bba5dae8f376..107722a7c07c 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -235,7 +235,7 @@ void OTableEditorInsUndoAct::Undo() { // delete lines again std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); - for( long i=(m_nInsPos+m_vInsertedRows.size()-1); i>(m_nInsPos-1); i-- ) + for( long i=m_nInsPos+m_vInsertedRows.size()-1; i>(m_nInsPos-1); i-- ) { pOriginalRows->erase(pOriginalRows->begin()+i); } @@ -282,7 +282,7 @@ void OTableEditorInsNewUndoAct::Undo() // delete inserted lines std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); - for( long i=(m_nInsPos+m_nInsRows-1); i>(m_nInsPos-1); i-- ) + for( long i=m_nInsPos+m_nInsRows-1; i>(m_nInsPos-1); i-- ) { pOriginalRows->erase(pOriginalRows->begin()+i); } |