diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-24 13:08:01 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-27 10:44:25 +0100 |
commit | 2e5508a17660401e1b4b489dbc9f70b978745b75 (patch) | |
tree | 881afcf9d8b9f0a653df0c94a8a2deefdf85670e | |
parent | 470682b3abf0622f5e9663d62d8641f63ceb6f30 (diff) |
loplugin:unnecessaryparen check for (f1()).f2
Change-Id: I93257b0ddd41c649875124d6d5c5faeaa431bae3
Reviewed-on: https://gerrit.libreoffice.org/45218
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
75 files changed, 160 insertions, 120 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index d112a9636609..f8ac1f4e6561 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -616,7 +616,7 @@ void DlgEditor::CreateDefaultObject() { // set position and size Size aSize = rWindow.PixelToLogic( Size( 96, 24 ) ); - Point aPoint = (pDlgEdForm->GetSnapRect()).Center(); + Point aPoint = pDlgEdForm->GetSnapRect().Center(); aPoint.X() -= aSize.Width() / 2; aPoint.Y() -= aSize.Height() / 2; pDlgEdObj->SetSnapRect( tools::Rectangle( aPoint, aSize ) ); @@ -973,8 +973,8 @@ void DlgEditor::Paste() } // center marked objects in dialog editor form - Point aMarkCenter = (pDlgEdView->GetMarkedObjRect()).Center(); - Point aFormCenter = (pDlgEdForm->GetSnapRect()).Center(); + Point aMarkCenter = pDlgEdView->GetMarkedObjRect().Center(); + Point aFormCenter = pDlgEdForm->GetSnapRect().Center(); Point aPoint = aFormCenter - aMarkCenter; Size aSize( aPoint.X() , aPoint.Y() ); pDlgEdView->MoveMarkedObj( aSize ); // update of control model properties (position + size) in NbcMove diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx index eaed3bacdc54..977adde32d7f 100644 --- a/basegfx/source/polygon/b2dpolypolygon.cxx +++ b/basegfx/source/polygon/b2dpolypolygon.cxx @@ -333,7 +333,7 @@ namespace basegfx // no Polygon exists. for(sal_uInt32 a(0); bRetval && a < mpPolyPolygon->count(); a++) { - if(!(mpPolyPolygon->getB2DPolygon(a)).isClosed()) + if(!mpPolyPolygon->getB2DPolygon(a).isClosed()) { bRetval = false; } @@ -362,7 +362,7 @@ namespace basegfx for(sal_uInt32 a(0); !bRetval && a < mpPolyPolygon->count(); a++) { - if((mpPolyPolygon->getB2DPolygon(a)).hasDoublePoints()) + if(mpPolyPolygon->getB2DPolygon(a).hasDoublePoints()) { bRetval = true; } diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index 08d01040f7fe..95d91181d2e7 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -349,7 +349,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange ) OUStringBuffer aBuffer; - if( !(rRange.aTableName).isEmpty()) + if( !rRange.aTableName.isEmpty()) { bool bNeedsEscaping = ( rRange.aTableName.indexOf( aQuote ) > -1 ); bool bNeedsQuoting = bNeedsEscaping || ( rRange.aTableName.indexOf( aSpace ) > -1 ); diff --git a/compilerplugins/clang/test/unnecessaryparen.cxx b/compilerplugins/clang/test/unnecessaryparen.cxx index c4bc0573505a..8a6a84468903 100644 --- a/compilerplugins/clang/test/unnecessaryparen.cxx +++ b/compilerplugins/clang/test/unnecessaryparen.cxx @@ -55,6 +55,7 @@ int main() S s1; if ((s1)) { // expected-error {{parentheses immediately inside if statement [loplugin:unnecessaryparen]}} // expected-error@-1 {{unnecessary parentheses around identifier [loplugin:unnecessaryparen]}} + // expected-error@-2 {{unnecessary parentheses around member expr [loplugin:unnecessaryparen]}} return 0; } S s2; @@ -66,4 +67,13 @@ int main() (void) sizeof (x); // expect no warning (for whatever reason; for symmetry with above case?) }; +struct S2 { + S2& GetText(); + void toChar(); +}; +void func2(S2 *p) +{ + (p->GetText()).toChar(); // expected-error {{unnecessary parentheses around member expr [loplugin:unnecessaryparen]}} +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/compilerplugins/clang/unnecessaryparen.cxx b/compilerplugins/clang/unnecessaryparen.cxx index 3a97c0d39456..dcf65f0c0234 100644 --- a/compilerplugins/clang/unnecessaryparen.cxx +++ b/compilerplugins/clang/unnecessaryparen.cxx @@ -83,6 +83,7 @@ public: bool VisitCXXOperatorCallExpr(const CXXOperatorCallExpr *); bool TraverseUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr *); bool TraverseCaseStmt(CaseStmt *); + bool VisitMemberExpr(const MemberExpr *f); private: void VisitSomeStmt(Stmt const * stmt, const Expr* cond, StringRef stmtName); Expr const * insideSizeof = nullptr; @@ -334,8 +335,6 @@ bool UnnecessaryParen::VisitVarDecl(const VarDecl* varDecl) || isa<CXXFunctionalCastExpr>(sub)) return true; -//varDecl->dump(); - report( DiagnosticsEngine::Warning, "parentheses immediately inside vardecl statement", parenExpr->getLocStart()) @@ -343,6 +342,37 @@ bool UnnecessaryParen::VisitVarDecl(const VarDecl* varDecl) return true; } +bool UnnecessaryParen::VisitMemberExpr(const MemberExpr* memberExpr) +{ + if (ignoreLocation(memberExpr)) + return true; + + auto parenExpr = dyn_cast<ParenExpr>(ignoreAllImplicit(memberExpr->getBase())); + if (!parenExpr) + return true; + if (parenExpr->getLocStart().isMacroID()) + return true; + + auto sub = parenExpr->getSubExpr(); + if (isa<CallExpr>(sub)) { + if (isa<CXXOperatorCallExpr>(sub)) + return true; + } else if (isa<CXXConstructExpr>(sub)) { + // warn + } else if (isa<MemberExpr>(sub)) { + // warn + } else if (isa<DeclRefExpr>(sub)) { + // warn + } else + return true; + + report( + DiagnosticsEngine::Warning, "unnecessary parentheses around member expr", + parenExpr->getLocStart()) + << parenExpr->getSourceRange(); + return true; +} + loplugin::Plugin::Registration< UnnecessaryParen > X("unnecessaryparen", true); } diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 80bcafe266c9..9e04619c923a 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -162,7 +162,7 @@ namespace connectivity initFields(); if ( nCol < nFields ) - return (pFields[nCol]->pField)->value_type; + return pFields[nCol]->pField->value_type; return G_TYPE_STRING; } diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index ead7a912252d..3de5465b29a5 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -396,10 +396,10 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex) ::connectivity::checkDisposed(OStatement_BASE::rBHelper.bDisposed); if ( m_aAssignValues.is() && (parameterIndex < 1 || parameterIndex >= static_cast<sal_Int32>(m_aParameterIndexes.size())) ) throwInvalidIndexException(*this); - else if ( static_cast<sal_Int32>((m_aParameterRow->get()).size()) <= parameterIndex ) + else if ( static_cast<sal_Int32>(m_aParameterRow->get().size()) <= parameterIndex ) { sal_Int32 i = m_aParameterRow->get().size(); - (m_aParameterRow->get()).resize(parameterIndex+1); + m_aParameterRow->get().resize(parameterIndex+1); for ( ; i <= parameterIndex; ++i) { if ( !(m_aParameterRow->get())[i].is() ) diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index 32f45cd9b747..503f76a84e9d 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -70,7 +70,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { - return (m_xColumns->get()).size(); + return m_xColumns->get().size(); } diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index f607077f9605..fdd374c63ff2 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -345,8 +345,8 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex) m_aParameterRow->get().push_back(sal_Int32(0)); } - if ((sal_Int32)(m_aParameterRow->get()).size() <= parameterIndex) - (m_aParameterRow->get()).resize(parameterIndex+1); + if ((sal_Int32)m_aParameterRow->get().size() <= parameterIndex) + m_aParameterRow->get().resize(parameterIndex+1); } void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 61ff7dd8e15f..1312926f6d1d 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -1048,7 +1048,7 @@ void SAL_CALL OResultSet::executeQuery() if (rTabs.empty() || !rTabs.begin()->second.is()) m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); - m_xTable = static_cast< OTable* > ((rTabs.begin()->second).get()); + m_xTable = static_cast< OTable* > (rTabs.begin()->second.get()); } m_nRowPos = 0; diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index 59ed049d26b7..2d362eefc291 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -61,7 +61,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { - return static_cast<sal_Int32>((m_xColumns->get()).size()); + return static_cast<sal_Int32>(m_xColumns->get().size()); } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 5e92b07aa697..d589da130b6a 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -434,7 +434,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) ExecStatusType state = PQresultStatus( result ); *(data->pLastOidInserted) = 0; - (data->pLastTableInserted)->clear(); + data->pLastTableInserted->clear(); *(data->pLastQuery) = cmd; bool ret = false; diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index bf1635051f98..64bd85dcff1e 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1101,7 +1101,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) // remove function name from selected entry sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1; m_pEntriesBox->SetEntryText( OUString(), nPos, nCol ); - (pEntry->m_sCommand).clear(); + pEntry->m_sCommand.clear(); m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox ); } diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 0bad4dd8b594..2e5d452b616c 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -875,7 +875,7 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const case PROPERTY_ID_USER: rValue >>= m_pImpl->m_sUser; // if the user name has changed, reset the password - (m_pImpl->m_aPassword).clear(); + m_pImpl->m_aPassword.clear(); break; case PROPERTY_ID_PASSWORD: rValue >>= m_pImpl->m_aPassword; @@ -1086,7 +1086,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const m_pImpl->m_aPassword = pAuthenticate->getPassword(); bNewPasswordGiven = true; } - (m_pImpl->m_sFailedPassword).clear(); + m_pImpl->m_sFailedPassword.clear(); } try @@ -1101,7 +1101,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const // assume that we had an authentication problem. Without this we may, after an unsuccessful connect, while // the user gave us a password an the order to remember it, never allow an password input again (at least // not without restarting the session) - (m_pImpl->m_aPassword).clear(); + m_pImpl->m_aPassword.clear(); } throw; } diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index cf3564d7cbef..857745bdce56 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -441,7 +441,7 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement() if( maPortions.empty() || mnNextPortion >= maPortions.size() ) throw container::NoSuchElementException(); - uno::Reference< text::XTextRange > xRange = ( maPortions.at(mnNextPortion) ).get(); + uno::Reference< text::XTextRange > xRange = maPortions.at(mnNextPortion).get(); mnNextPortion++; return uno::makeAny( xRange ); } diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 8c52e1c138c8..93fec712db8c 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -1262,7 +1262,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) if( ((1 == iter2->Pos) || (2 == iter2->Pos)) && autoDownloadEnabled && !iter2->URL2.isEmpty()) { iter2->URL = iter2->URL2; - (iter2->URL2).clear(); + iter2->URL2.clear(); iter2->Pos = iter2->Pos2; iter2->Pos2 = 0; } diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 8870797d151e..0fde944a6fd7 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2275,14 +2275,14 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen) return; } // write (Windows-)BITMAPINFOHEADER: - (p->pBMP)->WriteUInt32( 40 ).WriteUInt32( p->nWidth ).WriteUInt32( p->nHeight ); - (p->pBMP)->WriteUInt16( 1 ).WriteUInt16( p->nBitsPerPixel ); - (p->pBMP)->WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 ); - (p->pBMP)->WriteUInt32( 0 ).WriteUInt32( 0 ); + p->pBMP->WriteUInt32( 40 ).WriteUInt32( p->nWidth ).WriteUInt32( p->nHeight ); + p->pBMP->WriteUInt16( 1 ).WriteUInt16( p->nBitsPerPixel ); + p->pBMP->WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 ); + p->pBMP->WriteUInt32( 0 ).WriteUInt32( 0 ); // write color table: if (p->nBitsPerPixel<=8) { sal_uInt16 i, nColTabSize=1<<(p->nBitsPerPixel); - for (i=0; i<nColTabSize; i++) (p->pBMP)->WriteUInt32( GetPalette0RGB(i) ); + for (i=0; i<nColTabSize; i++) p->pBMP->WriteUInt32( GetPalette0RGB(i) ); } } // OK, now the map data is being pushed. Unfortunately OS2 and BMP diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f1b8c65759d6..aedba3aad7b9 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5412,7 +5412,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe if ( !aCharPropList.empty() && ( aCharPropList.back()->mnParagraph != nCurrentPara ) ) { PPTCharPropSet* pCharPropSet = new PPTCharPropSet( *aCharPropList.back(), nCurrentPara ); - (pCharPropSet->maString).clear(); + pCharPropSet->maString.clear(); pCharPropSet->mnOriginalTextPos = nStringLen - 1; aCharPropList.push_back( pCharPropSet ); } @@ -7060,7 +7060,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport pCurrent->mpFieldItem.reset( new SvxFieldItem( SvxURLField( pField->GetURL(), aRepresentation, SvxURLFormat::Repr ), EE_FEATURE_FIELD ) ); nHyperLenLeft = 0; } - (pCurrent->maString).clear(); + pCurrent->maString.clear(); pCurrent->SetColor( PPT_COLSCHEME_A_UND_HYPERLINK ); } nIdx++; diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index a01a959bd43e..ce4c169f78bc 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2093,13 +2093,13 @@ OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape ) void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf ) { if( rxIf.is() ) - (mpSVGExport->getInterfaceToIdentifierMapper()).registerReference( rxIf ); + mpSVGExport->getInterfaceToIdentifierMapper().registerReference( rxIf ); } const OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { - return (mpSVGExport->getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); + return mpSVGExport->getInterfaceToIdentifierMapper().getIdentifier( rxIf ); } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 83f4e8ec2580..a77c53b231ed 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -484,13 +484,13 @@ SVGTextWriter::~SVGTextWriter() void SVGTextWriter::implRegisterInterface( const Reference< XInterface >& rxIf ) { if( rxIf.is() ) - (mrExport.getInterfaceToIdentifierMapper()).registerReference( rxIf ); + mrExport.getInterfaceToIdentifierMapper().registerReference( rxIf ); } const OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { - return (mrExport.getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); + return mrExport.getInterfaceToIdentifierMapper().getIdentifier( rxIf ); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index c782149148e8..35ece49e3b4c 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -422,7 +422,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi { if( pOldInfo->maType == pOldInfo->maFilterName ) { - (pNewInfo->maType).clear(); + pNewInfo->maType.clear(); } } @@ -1130,7 +1130,7 @@ void XMLFilterSettingsDialog::initFilterList() Sequence< OUString > aExtensions; if( pValues2->Value >>= aExtensions ) { - (pTempFilter->maExtension).clear(); + pTempFilter->maExtension.clear(); sal_Int32 nCount3( aExtensions.getLength() ); OUString* pExtensions = aExtensions.getArray(); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 06c98a1dc6aa..c937e15a9e08 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -117,7 +117,7 @@ bool XMLFilterTabDialog::onOk() { nErrorPage = m_nBasicPageId; pErrorId = STR_ERROR_FILTER_NAME_EXISTS; - pFocusWindow = (mpBasicPage->m_pEDFilterName); + pFocusWindow = mpBasicPage->m_pEDFilterName; aReplace1 = mpNewInfo->maFilterName; } @@ -172,7 +172,7 @@ bool XMLFilterTabDialog::onOk() { nErrorPage = m_nBasicPageId; pErrorId = STR_ERROR_TYPE_NAME_EXISTS; - pFocusWindow = (mpBasicPage->m_pEDInterfaceName); + pFocusWindow = mpBasicPage->m_pEDInterfaceName; aReplace1 = mpNewInfo->maInterfaceName; aReplace2 = *pFilterName; } @@ -199,7 +199,7 @@ bool XMLFilterTabDialog::onOk() { pErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND; nErrorPage = m_nXSLTPageId; - pFocusWindow = (mpXSLTPage->m_pEDExportXSLT); + pFocusWindow = mpXSLTPage->m_pEDExportXSLT; } } } @@ -215,7 +215,7 @@ bool XMLFilterTabDialog::onOk() { pErrorId = STR_ERROR_IMPORT_XSLT_NOT_FOUND; nErrorPage = m_nXSLTPageId; - pFocusWindow = (mpXSLTPage->m_pEDImportTemplate); + pFocusWindow = mpXSLTPage->m_pEDImportTemplate; } } } @@ -225,7 +225,7 @@ bool XMLFilterTabDialog::onOk() { pErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND; nErrorPage = m_nXSLTPageId; - pFocusWindow = (mpXSLTPage->m_pEDExportXSLT); + pFocusWindow = mpXSLTPage->m_pEDExportXSLT; } if (!pErrorId) @@ -239,7 +239,7 @@ bool XMLFilterTabDialog::onOk() { pErrorId = STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND; nErrorPage = m_nXSLTPageId; - pFocusWindow = (mpXSLTPage->m_pEDImportTemplate); + pFocusWindow = mpXSLTPage->m_pEDImportTemplate; } } } diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index b6f521bfeea9..82ded83040f4 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -261,7 +261,7 @@ void TitleHelper::impl_sendTitleChangedEvent () aLock.clear (); // <- SYNCHRONIZED - if( ! (aEvent.Source).is() ) + if( ! aEvent.Source.is() ) return; ::cppu::OInterfaceContainerHelper* pContainer = m_aListener.getContainer( cppu::UnoType<css::frame::XTitleChangeListener>::get()); diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 2d5563d1213c..627a3b2735fe 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -152,7 +152,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus if (pItem != m_aStack.end()) { pItem->m_nValue = 0; - (pItem->m_sText).clear(); + pItem->m_sText.clear(); } css::uno::Reference< css::task::XStatusIndicator > xActive = m_xActiveChild; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index e293d40d0ee0..0af79491692e 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1139,7 +1139,7 @@ public: TSS_Type nInstanceInSheet, const PPTTextObj* pTextObj ); - sal_uInt32 Count() const { return ( mpFieldItem ) ? 1 : maString.getLength(); }; + sal_uInt32 Count() const { return mpFieldItem ? 1 : maString.getLength(); }; bool HasTabulator(); }; diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index c36a57f9986a..41e86c07c08d 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -695,7 +695,7 @@ inline bool RegistryKey::isValid() const inline bool RegistryKey::isReadOnly() const { if (m_registry.isValid()) - return (m_registry.m_pApi)->isKeyReadOnly(m_hImpl); + return m_registry.m_pApi->isKeyReadOnly(m_hImpl); else return false; } diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index b4068bf6e744..e9b19d7b2789 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -234,7 +234,7 @@ public: size_t TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); } SdrPageView* GetSdrPageViewOfMarkedByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } SdrMark* GetSdrMarkByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum); } - SdrObject* GetMarkedObjectByIndex(size_t nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); } + SdrObject* GetMarkedObjectByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetMarkedSdrObj(); } size_t GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } bool AreObjectsMarked() const { return 0 != GetMarkedObjectList().GetMarkCount(); } diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index 5d096cccd3ae..9692eedb7fa3 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -175,7 +175,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid } } - aStyleName = (pXFStyleMgr->AddStyle(pListStyle)).m_pStyle->GetStyleName(); + aStyleName = pXFStyleMgr->AddStyle(pListStyle).m_pStyle->GetStyleName(); } else { @@ -231,7 +231,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0); } - aStyleName = (pXFStyleMgr->AddStyle(pListStyle)).m_pStyle->GetStyleName(); + aStyleName = pXFStyleMgr->AddStyle(pListStyle).m_pStyle->GetStyleName(); } else delete pListStyle; diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index 504ccb366b73..858f8ea22c0b 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -555,7 +555,7 @@ void LwpCellLayout::RegisterDefaultCell() } xCellStyle->SetBorders(pBorders); } - m_CellStyleNames[eLoop] = (pXFStyleManager->AddStyle(xCellStyle.release())).m_pStyle->GetStyleName(); + m_CellStyleNames[eLoop] = pXFStyleManager->AddStyle(xCellStyle.release()).m_pStyle->GetStyleName(); } } /** @@ -587,7 +587,7 @@ void LwpCellLayout::RegisterStyle() pCellStyle->SetAlignType(enumXFAlignNone, GetVerticalAlignmentType()); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - m_StyleName = (pXFStyleManager->AddStyle(pCellStyle)).m_pStyle->GetStyleName(); + m_StyleName = pXFStyleManager->AddStyle(pCellStyle).m_pStyle->GetStyleName(); // content object register styles rtl::Reference<LwpObject> pObj = m_Content.obj(); diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index fe974a1c50f0..1494106fd966 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -446,7 +446,7 @@ OUString LwpDrawLine::RegisterStyle() SetArrowHead(pStyle, m_aLineRec.nLineEnd, m_aLineRec.nLineWidth); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - return (pXFStyleManager->AddStyle(pStyle)).m_pStyle->GetStyleName(); + return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName(); } diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index c4e3d670d9c2..7f20d13b8200 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -744,7 +744,7 @@ writeCustomProperties( XmlFilterBase& rSelf, const Reference< XDocumentPropertie XML_name, aName, FSEND); - switch ( ( aprop[n].Value ).getValueTypeClass() ) + switch ( aprop[n].Value.getValueTypeClass() ) { case TypeClass_STRING: { diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 76f3585e04d2..ffefc380fe48 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -390,7 +390,7 @@ AxisDispUnitsConverter::~AxisDispUnitsConverter() void AxisDispUnitsConverter::convertFromModel( const Reference< XAxis >& rxAxis ) { PropertySet aPropSet( rxAxis ); - if (!(mrModel.mnBuiltInUnit).isEmpty() ) + if (!mrModel.mnBuiltInUnit.isEmpty() ) { aPropSet.setProperty(PROP_DisplayUnits, true); aPropSet.setProperty( PROP_BuiltInUnit, mrModel.mnBuiltInUnit ); diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index f9fa58669c35..acc2bfade57a 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -385,7 +385,7 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS aGrabBag.push_back(comphelper::makePropertyValue("LinkChainName", sLinkChainName)); } - if(!(maTypeModel.maRotation).isEmpty()) + if(!maTypeModel.maRotation.isEmpty()) aGrabBag.push_back(comphelper::makePropertyValue("mso-rotation-angle", ConversionHelper::decodeRotation(maTypeModel.maRotation))); propertySet->setPropertyValue("FrameInteropGrabBag", uno::makeAny(comphelper::containerToSequence(aGrabBag))); sal_Int32 backColorTransparency = 0; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 406d40ed972c..373615960665 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -941,7 +941,7 @@ struct ScShapePointFound bool operator() (const ScShapeChild& rShape) { bool bResult(false); - if ((VCLRectangle(rShape.mpAccShape->getBounds())).IsInside(maPoint)) + if (VCLRectangle(rShape.mpAccShape->getBounds()).IsInside(maPoint)) bResult = true; return bResult; } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index a70db85be5bb..23cfa22074ab 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -630,11 +630,11 @@ void ScModule::ResetDragObject() mpDragData->pCellTransfer = nullptr; mpDragData->pDrawTransfer = nullptr; mpDragData->pJumpLocalDoc = nullptr; - (mpDragData->aLinkDoc).clear(); - (mpDragData->aLinkTable).clear(); - (mpDragData->aLinkArea).clear(); - (mpDragData->aJumpTarget).clear(); - (mpDragData->aJumpText).clear(); + mpDragData->aLinkDoc.clear(); + mpDragData->aLinkTable.clear(); + mpDragData->aLinkArea.clear(); + mpDragData->aJumpTarget.clear(); + mpDragData->aJumpText.clear(); } void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 8ee43ebc0a1f..a28e02234ad0 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -332,8 +332,8 @@ bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const const ScUserListItem& r = static_cast<const ScUserListItem&>(rItem); bool bEqual = false; - if ( !pUserList || !(r.pUserList) ) - bEqual = ( !pUserList && !(r.pUserList) ); + if ( !pUserList || !r.pUserList ) + bEqual = ( !pUserList && !r.pUserList ); else bEqual = ( *pUserList == *(r.pUserList) ); diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index b13db135d299..5fbd8d9ab608 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -417,7 +417,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) if(rKEvt.GetKeyCode().IsMod2()) { // move in 1 pixel distance - Size aLogicSizeOnePixel = (pWindow) ? pWindow->PixelToLogic(Size(1,1)) : Size(100, 100); + Size aLogicSizeOnePixel = pWindow ? pWindow->PixelToLogic(Size(1,1)) : Size(100, 100); nX *= aLogicSizeOnePixel.Width(); nY *= aLogicSizeOnePixel.Height(); } diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 652206824822..760856c46bef 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -723,7 +723,7 @@ bool SdDrawDocument::CreateMissingNotesAndHandoutPages() pNotesPage->SetPageKind(PageKind::Notes); // Set notes master page - sal_uInt16 nMasterPageAfterPagesMasterPage = (pPage->TRG_GetMasterPage()).GetPageNum() + 1; + sal_uInt16 nMasterPageAfterPagesMasterPage = pPage->TRG_GetMasterPage().GetPageNum() + 1; pNotesPage->TRG_SetMasterPage(*GetMasterPage(nMasterPageAfterPagesMasterPage)); } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 3f2e80b592c2..95ee8c096d23 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2263,7 +2263,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) for( sal_Int32 i = 0; i < nSlideCount; i++ ) { - bool bVisible = !( mpDoc->GetSdPage( (sal_uInt16)i, PageKind::Standard ) )->IsExcluded(); + bool bVisible = ! mpDoc->GetSdPage( (sal_uInt16)i, PageKind::Standard )->IsExcluded(); if( bVisible || (eMode == AnimationSlideController::ALL) ) mpSlideController->insertSlideNumber( i, bVisible ); } @@ -2289,7 +2289,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { const sal_uInt16 nSdSlide = ( (*it)->GetPageNum() - 1 ) / 2; - if( !( mpDoc->GetSdPage( nSdSlide, PageKind::Standard ) )->IsExcluded()) + if( ! mpDoc->GetSdPage( nSdSlide, PageKind::Standard )->IsExcluded()) mpSlideController->insertSlideNumber( nSdSlide ); } } diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index ab16b1b1419f..d3c6d2ee0877 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1864,7 +1864,7 @@ namespace sal_Int16 nRet = 0; for (sal_Int16 i = 0; i < nPageNumber-1; ++i) { - if (!(pDoc->GetSdPage(i, PageKind::Standard))->IsExcluded()) + if (!pDoc->GetSdPage(i, PageKind::Standard)->IsExcluded()) ++nRet; } return nRet; @@ -1907,7 +1907,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r { vcl::PDFExtOutDevData* pPDFExtOutDevData = dynamic_cast<vcl::PDFExtOutDevData* >( pOut->GetExtOutDevData() ); - if ( !( (mpDoc->GetSdPage((sal_Int16) nPageNumber-1, PageKind::Standard))->IsExcluded() ) || + if ( !( mpDoc->GetSdPage((sal_Int16) nPageNumber-1, PageKind::Standard)->IsExcluded() ) || (pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportHiddenSlides()) ) { std::unique_ptr<::sd::ClientView> pView( new ::sd::ClientView( mpDocShell, pOut ) ); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 10f25204c810..12450239f32b 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2390,7 +2390,7 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& SdPage* pNotesPage = GetModel()->GetDoc()->GetSdPage( (SvxFmDrawPage::mpPage->GetPageNum()-1)>>1, PageKind::Notes ); pNotesPage->TRG_ClearMasterPage(); - sal_uInt16 nNum = (SvxFmDrawPage::mpPage->TRG_GetMasterPage()).GetPageNum() + 1; + sal_uInt16 nNum = SvxFmDrawPage::mpPage->TRG_GetMasterPage().GetPageNum() + 1; pNotesPage->TRG_SetMasterPage(*SvxFmDrawPage::mpPage->GetModel()->GetMasterPage(nNum)); pNotesPage->SetLayoutName( pSdPage->GetLayoutName() ); diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index e99c946ac73e..1fe6c15deb38 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -73,12 +73,12 @@ void PresenterPaneContainer::PreparePane ( if (rsTitle.indexOf('%') < 0) { pDescriptor->msTitle = rsTitle; - (pDescriptor->msTitleTemplate).clear(); + pDescriptor->msTitleTemplate.clear(); } else { pDescriptor->msTitleTemplate = rsTitle; - (pDescriptor->msTitle).clear(); + pDescriptor->msTitle.clear(); } pDescriptor->msAccessibleTitleTemplate = rsAccessibleTitle; pDescriptor->maViewInitialization = rViewInitialization; diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 197e8f2e4184..88c60b1625a3 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -287,7 +287,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage ( if (pDescriptor.get() != nullptr) { pDescriptor->msTitleTemplate = msTitleTemplate; - (pDescriptor->msTitle).clear(); + pDescriptor->msTitle.clear(); mpPresenterController->UpdatePaneTitles(); } } diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index a58e86d875a2..958429f6e005 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -706,8 +706,8 @@ bool TemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString & if (!pItem->maTemplates.empty()) { - nId = (pItem->maTemplates.back()).nId+1; - nDocId = (pItem->maTemplates.back()).nDocId+1; + nId = pItem->maTemplates.back().nId+1; + nDocId = pItem->maTemplates.back().nDocId+1; } if (mpDocTemplates->CopyFrom(nRegionId,nDocId,aPath)) diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index a5e62da8c0a2..ff504a1d448b 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -513,7 +513,7 @@ bool SfxObjectShell::SwitchToShared( bool bShared, bool bSave ) { const OUString aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::NONE ); GetMedium()->SwitchDocumentToFile( GetSharedFileURL() ); - (pImpl->m_aSharedFileURL).clear(); + pImpl->m_aSharedFileURL.clear(); // now remove the temporary file the document was based on ::utl::UCBContentHelper::Kill( aTempFileURL ); @@ -581,7 +581,7 @@ void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL ) // now remove the temporary file the document is based currently on ::utl::UCBContentHelper::Kill( aTempFileURL ); - (pImpl->m_aSharedFileURL).clear(); + pImpl->m_aSharedFileURL.clear(); } } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 2456829d52bb..39c5dd2b75aa 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -617,7 +617,7 @@ const std::shared_ptr< vcl::PrinterController >& SfxViewShell::GetPrinterControl Printer* SfxViewShell::GetActivePrinter() const { - return (pImpl->m_xPrinterController) + return pImpl->m_xPrinterController ? pImpl->m_xPrinterController->getPrinter().get() : nullptr; } diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 50290d0b5c6b..91177f626246 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -175,7 +175,7 @@ Reference< XIdlClass > IdlAttributeFieldImpl::getType() FieldAccessMode IdlAttributeFieldImpl::getAccessMode() { - return ((getAttributeTypeDescr())->bReadOnly + return (getAttributeTypeDescr()->bReadOnly ? FieldAccessMode_READONLY : FieldAccessMode_READWRITE); } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index d3e48317f4d0..c4c26e19df3b 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -809,7 +809,7 @@ SvNumberformat::SvNumberformat(OUString& rString, // Original language/country may have to be reestablished if (rScan.GetConvertMode()) { - (rScan.GetNumberformatter())->ChangeIntl(rScan.GetTmpLnge()); + rScan.GetNumberformatter()->ChangeIntl(rScan.GetTmpLnge()); } OUString sInsertCalendar; // a calendar resulting from parsing LCID OUString sStr; diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 45beb0d17853..b4132230b468 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -401,7 +401,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate ) if ( bUpdate ) { mpImpl->pGraphic.reset(); - (mpImpl->aMediaType).clear(); + mpImpl->aMediaType.clear(); mpImpl->pGraphic.reset( new Graphic ); mpImpl->mnGraphicVersion++; } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 7db9601c8aa7..7941133c717b 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1999,7 +1999,7 @@ bool TransferableDataHelper::GetFileList( FileList& rFileList ) bRet = true; } else - bRet = ( ( ReadFileList( *xStm, rFileList ) ).GetError() == ERRCODE_NONE ); + bRet = ( ReadFileList( *xStm, rFileList ).GetError() == ERRCODE_NONE ); } } } diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx index 9928960034e1..070bdfc50980 100644 --- a/svx/source/styles/CommonStylePreviewRenderer.cxx +++ b/svx/source/styles/CommonStylePreviewRenderer.cxx @@ -205,7 +205,7 @@ bool CommonStylePreviewRenderer::render(const tools::Rectangle& aRectangle, Rend if (maFontColor != COL_AUTO) mrOutputDev.SetTextColor(maFontColor); - Size aPixelSize((m_pFont) ? maPixelSize : mrOutputDev.GetFont().GetFontSize()); + Size aPixelSize(m_pFont ? maPixelSize : mrOutputDev.GetFont().GetFontSize()); Point aFontDrawPosition = aRectangle.TopLeft(); if (eRenderAlign == RenderAlign::CENTER) diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 0d60a9d09af3..6a9d33767e35 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1409,7 +1409,7 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex) } if (pTextField) { - const SwField* pField = (pTextField->GetFormatField()).GetField(); + const SwField* pField = pTextField->GetFormatField().GetField(); if (pField) { strTypeName = SwFieldType::GetTypeStr(pField->GetTypeId()); diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx index 18c4c857f7d4..cae3a0b17fca 100644 --- a/sw/source/core/crsr/crbm.cxx +++ b/sw/source/core/crsr/crbm.cxx @@ -103,9 +103,9 @@ bool SwCursorShell::GotoMark(const ::sw::mark::IMark* const pMark, bool bAtStart // watch Cursor-Moves CursorStateHelper aCursorSt(*this); if ( bAtStart ) - *(aCursorSt.m_pCursor)->GetPoint() = pMark->GetMarkStart(); + *aCursorSt.m_pCursor->GetPoint() = pMark->GetMarkStart(); else - *(aCursorSt.m_pCursor)->GetPoint() = pMark->GetMarkEnd(); + *aCursorSt.m_pCursor->GetPoint() = pMark->GetMarkEnd(); if(aCursorSt.RollbackIfIllegal()) return false; diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 4c824c2198da..7f97c0c83250 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -434,7 +434,7 @@ void ContentIdxStoreImpl::SaveShellCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int } while ( (_pStackCursor != nullptr ) && ((_pStackCursor = _pStackCursor->GetNext()) != static_cast<SwCursorShell*>(&rCurShell)->GetStackCursor()) ); - for(SwPaM& rPaM : (static_cast<SwCursorShell*>(&rCurShell)->GetCursor_())->GetRingContainer()) + for(SwPaM& rPaM : static_cast<SwCursorShell*>(&rCurShell)->GetCursor_()->GetRingContainer()) { lcl_ChkPaMBoth( m_aShellCursorEntries, nNode, nContent, rPaM); } diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index f0e1609c115f..414433ababd7 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -524,7 +524,7 @@ bool DocumentFieldsManager::UpdateField(SwTextField * pDstTextField, SwField & r case SwFieldIds::Macro: if( bUpdateFields && pDstTextField->GetpTextNode() ) - (pDstTextField->GetpTextNode())-> + pDstTextField->GetpTextNode()-> ModifyNotification( nullptr, pDstFormatField ); break; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 158e5dd30ac6..d27b15468de6 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1722,7 +1722,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo ) { do { SwPosition& rSttEnd = *pTmp->End(), - & rEndStt = *(pTmp->GetNext())->Start(); + & rEndStt = *pTmp->GetNext()->Start(); const SwContentNode* pCNd; if( rSttEnd == rEndStt || (!rEndStt.nContent.GetIndex() && @@ -1740,7 +1740,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo ) else { // are consecutive, so combine - rSttEnd = *(pTmp->GetNext())->End(); + rSttEnd = *pTmp->GetNext()->End(); delete pTmp->GetNext(); } } diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index de694019e1bd..00703c236c16 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -306,7 +306,7 @@ void SwFrame::PrepareMake(vcl::RenderContext* pRenderContext) // me when formatting. This as you can see could easily become a // confusing situation that we want to avoid. if ( bFoll && pFrame->IsFlowFrame() && - (SwFlowFrame::CastFlowFrame(pFrame))->IsAnFollow( pThis ) ) + SwFlowFrame::CastFlowFrame(pFrame)->IsAnFollow( pThis ) ) break; pFrame->MakeAll(pRenderContext); @@ -417,7 +417,7 @@ void SwFrame::PrepareCursor() // me when formatting. This as you can see could easily become a // confusing situation that we want to avoid. if ( bFoll && pFrame->IsFlowFrame() && - (SwFlowFrame::CastFlowFrame(pFrame))->IsAnFollow( pThis ) ) + SwFlowFrame::CastFlowFrame(pFrame)->IsAnFollow( pThis ) ) break; pFrame->MakeAll(getRootFrame()->GetCurrShell()->GetOut()); diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index d49eac75c66c..23fd2a19c624 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -550,7 +550,7 @@ void SwFootnoteFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) if ( GetPrev() && GetPrev() == GetMaster() ) { OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetPrev()->GetLower() ), "Footnote without content?" ); - (SwFlowFrame::CastFlowFrame( GetPrev()->GetLower()))-> + SwFlowFrame::CastFlowFrame( GetPrev()->GetLower())-> MoveSubTree( this, GetLower() ); SwFrame *pDel = GetPrev(); pDel->Cut(); @@ -559,7 +559,7 @@ void SwFootnoteFrame::Paste( SwFrame* pParent, SwFrame* pSibling ) if ( GetNext() && GetNext() == GetFollow() ) { OSL_ENSURE( SwFlowFrame::CastFlowFrame( GetNext()->GetLower() ), "Footnote without content?" ); - (SwFlowFrame::CastFlowFrame( GetNext()->GetLower()))->MoveSubTree( this ); + SwFlowFrame::CastFlowFrame( GetNext()->GetLower() )->MoveSubTree( this ); SwFrame *pDel = GetNext(); pDel->Cut(); SwFrame::DestroyFrame(pDel); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 51370b19b021..8d41f27b870b 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2212,22 +2212,22 @@ static void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const vcl::RenderCont aSizedRect.Bottom() += (aTwipToPxSize.Height()/2 + 1); // adjust left() - while ( (aOut.LogicToPixel(aSizedRect)).Left() < aOrgPxRect.Left() ) + while ( aOut.LogicToPixel(aSizedRect).Left() < aOrgPxRect.Left() ) { ++aSizedRect.Left(); } // adjust right() - while ( (aOut.LogicToPixel(aSizedRect)).Right() > aOrgPxRect.Right() ) + while ( aOut.LogicToPixel(aSizedRect).Right() > aOrgPxRect.Right() ) { --aSizedRect.Right(); } // adjust top() - while ( (aOut.LogicToPixel(aSizedRect)).Top() < aOrgPxRect.Top() ) + while ( aOut.LogicToPixel(aSizedRect).Top() < aOrgPxRect.Top() ) { ++aSizedRect.Top(); } // adjust bottom() - while ( (aOut.LogicToPixel(aSizedRect)).Bottom() > aOrgPxRect.Bottom() ) + while ( aOut.LogicToPixel(aSizedRect).Bottom() > aOrgPxRect.Bottom() ) { --aSizedRect.Bottom(); } diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 491c3f3b2e52..2e39abf3c40e 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2320,7 +2320,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) // section which has a height of 0, because this is not growable and thus // all kinds of unexpected things could happen. if ( !bEmulateTableKeepFwdMoveAllowed || - ( IsInSct() && (FindSctFrame())->Lower()->IsColumnFrame() && + ( IsInSct() && FindSctFrame()->Lower()->IsColumnFrame() && 0 == aRectFnSet.GetHeight(GetUpper()->getFrameArea()) ) ) { diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index ad35d18daf01..d4f4a9097b9c 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -420,7 +420,7 @@ SwRect SwTextFrame::Paint() long l; if ( IsVertLR() ) // mba: the following line was added, but we don't need it for the existing directions; kept for IsVertLR(), but should be checked - rRepaint.Chg( ( GetUpper()->getFrameArea() ).Pos() + ( GetUpper()->getFramePrintArea() ).Pos(), ( GetUpper()->getFramePrintArea() ).SSize() ); + rRepaint.Chg( GetUpper()->getFrameArea().Pos() + GetUpper()->getFramePrintArea().Pos(), GetUpper()->getFramePrintArea().SSize() ); if( rRepaint.GetOfst() ) rRepaint.Left( rRepaint.GetOfst() ); diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 55275b0e8c80..383362f87f5b 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -559,7 +559,7 @@ bool SwFormatMeta::operator==( const SfxPoolItem & i_rOther ) const SfxPoolItem * SwFormatMeta::Clone( SfxItemPool * /*pPool*/ ) const { // if this is indeed a copy, then DoCopy must be called later! - return (m_pMeta) // #i105148# pool default may be cloned also! + return m_pMeta // #i105148# pool default may be cloned also! ? new SwFormatMeta( m_pMeta, Which() ) : new SwFormatMeta( Which() ); } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 60d24750cd51..424564b72450 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1048,7 +1048,7 @@ bool SwTextNode::Spell(SwSpellArgs* pArgs) pArgs->xSpellAlt = pArgs->xSpeller->spell( rWord, (sal_uInt16)eActLang, Sequence< PropertyValue >() ); } - if( (pArgs->xSpellAlt).is() ) + if( pArgs->xSpellAlt.is() ) { if( IsSymbol( aScanner.GetBegin() ) ) { diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 6eb73d3c0147..1d07c320bb12 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -343,7 +343,7 @@ SwXParagraph::attachToText(SwXText & rParent, SwTextNode & rTextNode) { try { setString(m_pImpl->m_sText); } catch(...){} - (m_pImpl->m_sText).clear(); + m_pImpl->m_sText.clear(); } } } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index b8c32ae13f78..0a587b80f129 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -1459,7 +1459,7 @@ SwXTextSection::setPropertyToDefault(const OUString& rPropertyName) { if (m_pImpl->m_bIsDescriptor) { - (m_pImpl->m_pProps->m_sCondition).clear(); + m_pImpl->m_pProps->m_sCondition.clear(); } else { @@ -1475,9 +1475,9 @@ SwXTextSection::setPropertyToDefault(const OUString& rPropertyName) if (m_pImpl->m_bIsDescriptor) { m_pImpl->m_pProps->m_bDDE = false; - (m_pImpl->m_pProps->m_sLinkFileName).clear(); - (m_pImpl->m_pProps->m_sSectionRegion).clear(); - (m_pImpl->m_pProps->m_sSectionFilter).clear(); + m_pImpl->m_pProps->m_sLinkFileName.clear(); + m_pImpl->m_pProps->m_sSectionRegion.clear(); + m_pImpl->m_pProps->m_sSectionFilter.clear(); } else { diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 431d9a42f73c..9e82fb933a85 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -693,7 +693,7 @@ void SwHHCWrapper::ConvEnd_impl( SwConversionArgs const *pConversionArgs ) bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs ) { bool bProgress = !m_bIsDrawObj && !m_bIsSelection; - (pConversionArgs->aConvText).clear(); + pConversionArgs->aConvText.clear(); pConversionArgs->nConvTextLang = LANGUAGE_NONE; m_pView->GetWrtShell().SpellContinue( &m_nPageCount, bProgress ? &m_nPageStart : nullptr, pConversionArgs ); return !pConversionArgs->aConvText.isEmpty(); diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 4ac8be850663..5a7aa7de520b 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1175,7 +1175,7 @@ void SwPagePreview::Init() SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): SfxViewShell( pViewFrame, SWVIEWFLAGS ), - m_pViewWin( VclPtr<SwPagePreviewWin>::Create(&(GetViewFrame())->GetWindow(), *this ) ), + m_pViewWin( VclPtr<SwPagePreviewWin>::Create(&GetViewFrame()->GetWindow(), *this ) ), m_nNewPage(USHRT_MAX), m_sPageStr(SwResId(STR_PAGE)), m_pHScrollbar(nullptr), diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 2e10acd8b45e..357ec98cc461 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -1253,7 +1253,7 @@ void SwLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderCont { SwGlblDocContent* pCont = static_cast<SwGlblDocContent*>(rEntry.GetUserData()); if (pCont->GetType() == GLBLDOC_SECTION && - !(pCont->GetSection())->IsConnectFlag()) + !pCont->GetSection()->IsConnectFlag()) { rRenderContext.Push(PushFlags::FONT); vcl::Font aOldFont(rRenderContext.GetFont()); diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 96d7212643a1..785b0fbfd59b 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -370,8 +370,8 @@ void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries) { SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName); pGroup->nCount = pBlock ? pBlock->GetCount() : 0; - (pGroup->sLongNames).clear(); - (pGroup->sShortNames).clear(); + pGroup->sLongNames.clear(); + pGroup->sShortNames.clear(); if(pBlock) pGroup->sTitle = pBlock->GetName(); diff --git a/unoxml/source/events/eventdispatcher.cxx b/unoxml/source/events/eventdispatcher.cxx index 27a394940233..85f6df5b9c14 100644 --- a/unoxml/source/events/eventdispatcher.cxx +++ b/unoxml/source/events/eventdispatcher.cxx @@ -67,7 +67,7 @@ namespace DOM { namespace events { while (iter != rMap.end() && iter->first == pNode) { // erase all references to specified listener - if ((iter->second).is() && iter->second == aListener) + if (iter->second.is() && iter->second == aListener) { ListenerMap::iterator tmp_iter = iter; ++iter; @@ -96,7 +96,7 @@ namespace DOM { namespace events { auto const ibound = rMap.upper_bound(pNode); for( ; iter != ibound; ++iter ) { - if((iter->second).is()) + if(iter->second.is()) (iter->second)->handleEvent(xEvent); } } diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 89d898603bf0..f75ba2dd4751 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -170,7 +170,7 @@ void FixedText::ImplDraw(OutputDevice* pDev, DrawFlags nDrawFlags, nTextStyle |= DrawTextFlags::Mono; if( bFillLayout ) - (mpControlData->mpLayoutData->m_aDisplayText).clear(); + mpControlData->mpLayoutData->m_aDisplayText.clear(); const tools::Rectangle aRect(aPos, rSize); DrawControlText(*pDev, aRect, aText, nTextStyle, diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index aba8a2fd4adc..63aa3f505f0c 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -407,7 +407,7 @@ const uno::Sequence<beans::PropertyValue> DomainMapperTableManager::getCurrentTa TablePositionHandler* DomainMapperTableManager::getCurrentTableRealPosition() { if ( !m_aTablePositions.empty( ) && m_aTablePositions.back() ) - return (m_aTablePositions.back( )).get(); + return m_aTablePositions.back().get(); else return nullptr; } diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 01e9027caf95..b1555ee2b0c4 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -797,7 +797,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe , uno::makeAny(chart::ChartAxisAssign::SECONDARY_Y) ); } - if( !(seriesStyle.msStyleName).isEmpty()) + if( !seriesStyle.msStyleName.isEmpty()) { if( rCurrStyleName != seriesStyle.msStyleName ) { @@ -957,7 +957,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles if( !xSeriesProp.is() ) continue; - if( !(seriesStyle.msStyleName).isEmpty()) + if( !seriesStyle.msStyleName.isEmpty()) { if( rCurrStyleName != seriesStyle.msStyleName ) { diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 441b4c53bde0..cb6e09720edf 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -311,7 +311,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName, if( -1 == nColonPos ) { // case: no ':' found -> default namespace - (xEntry->sPrefix).clear(); + xEntry->sPrefix.clear(); xEntry->sName = rAttrName; } else diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 5ec5a0cb544f..dae2d815c1c6 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -56,7 +56,7 @@ void XMLTextExportPropertySetMapper::handleElementItem( pThis->maDropCapExport.exportXML( rProperty.maValue, bDropWholeWord, sDropCharStyle ); pThis->bDropWholeWord = false; - (pThis->sDropCharStyle).clear(); + pThis->sDropCharStyle.clear(); break; case CTF_TABSTOP: |