diff options
Diffstat (limited to 'sw')
33 files changed, 63 insertions, 59 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 8493de67b9eb..3c328fda911a 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2410,9 +2410,7 @@ so run here: save the parent's SwFrame not the accessible object parent, bIsTextParent =true; } } -// bool bIsVisibleChildrenOnly =aFrameOrObj.IsVisibleChildrenOnly() ; -// bool bIsBoundAsChar =aFrameOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar && - if((bIsValidFrame || bIsTextParent) ) + if( bIsValidFrame || bIsTextParent ) { if( GetShell()->ActionPend() ) { diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index a2e4fb9b9c71..ef588936d12b 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -40,7 +40,7 @@ void SwClient::CheckRegistration( const SfxPoolItem* pOld ) { DBG_TESTSOLARMUTEX(); // this method only handles notification about dying SwModify objects - if( (!pOld || pOld->Which() != RES_OBJECTDYING) ) + if( !pOld || pOld->Which() != RES_OBJECTDYING ) return; const SwPtrMsgPoolItem* pDead = static_cast<const SwPtrMsgPoolItem*>(pOld); diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index 724e2975bed5..b23362d8e598 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -111,7 +111,7 @@ SwCallLink::~SwCallLink() const SwDoc *pDoc=rShell.GetDoc(); const SwContentNode *pNode = nullptr; - if ( ( pDoc != nullptr && nNode < pDoc->GetNodes( ).Count( ) ) ) + if ( pDoc && nNode < pDoc->GetNodes( ).Count( ) ) { pNode = pDoc->GetNodes()[nNode]->GetContentNode(); } diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index e7448e881816..57204ff80b5a 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -891,10 +891,10 @@ namespace { const sal_Int32 nFootnoteSttIdx = pSrch->GetStart(); if( !pEndCnt || !pSttCnt || - !( (( &rSttNd.GetNode() == pFootnoteNd && + ! (( &rSttNd.GetNode() == pFootnoteNd && pSttCnt->GetIndex() > nFootnoteSttIdx ) || - ( &rEndNd.GetNode() == pFootnoteNd && - nFootnoteSttIdx >= pEndCnt->GetIndex() )) )) + ( &rEndNd.GetNode() == pFootnoteNd && + nFootnoteSttIdx >= pEndCnt->GetIndex() )) ) { if( bDelFootnote ) { diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 4c80964c6ba8..80c96313eb31 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -639,8 +639,8 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, } break; case SwNodeType::Section: - if( ( static_cast<SwSectionNode*>(pNd)->GetSection().IsProtect() || - static_cast<SwSectionNode*>(pNd)->GetSection().IsHidden() ) ) + if( static_cast<SwSectionNode*>(pNd)->GetSection().IsProtect() || + static_cast<SwSectionNode*>(pNd)->GetSection().IsHidden() ) nCurrNd = pNd->EndOfSectionIndex(); break; case SwNodeType::End: diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 1d9859554c29..963b0aec3f56 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -307,7 +307,7 @@ SwFlyFrameFormat* SwDoc::MakeFlySection( RndStdIds eAnchorType, ( pFrameFormat && SfxItemState::SET == pFrameFormat->GetItemState( RES_ANCHOR, true, reinterpret_cast<const SfxPoolItem**>(&pAnch) )) ) { - if ( (RndStdIds::FLY_AT_PAGE != pAnch->GetAnchorId()) ) + if ( RndStdIds::FLY_AT_PAGE != pAnch->GetAnchorId() ) { pAnchorPos = pAnch->GetContentAnchor(); } diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index f7165eb5678e..c0967895e97c 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1607,7 +1607,7 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, GotoObjFlags eType, bool } } // unfortunately nothing found - if( (bNext? (aBestPos.getX() == LONG_MAX) : (aBestPos.getX() == 0)) ) + if( bNext ? (aBestPos.getX() == LONG_MAX) : (aBestPos.getX() == 0) ) pBest = pTop; } diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 662d1a5e61f8..9e65bfa046c3 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -51,7 +51,7 @@ /// Return value tells whether the Frame should be moved. bool SwContentFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool & ) { - if ( (SwFlowFrame::IsMoveBwdJump() || !IsPrevObjMove())) + if ( SwFlowFrame::IsMoveBwdJump() || !IsPrevObjMove() ) { // Floating back a frm uses a bit of time unfortunately. // The most common case is the following: The Frame wants to float to diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 23500f5e8107..9819e411f1cc 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -985,7 +985,7 @@ static const SwContentFrame * lcl_FindCnt( const Point &rPt, const SwContentFram nOldNew = nNew; } } - if ( (pRet->Frame().Top() > rPt.Y()) ) + if ( pRet->Frame().Top() > rPt.Y() ) return pNearest; else return pRet; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index ad5364568728..63a85fa3555a 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -3304,7 +3304,7 @@ SwContentFrame *SwTabFrame::FindLastContent() bool SwTabFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool &rReformat ) { rReformat = false; - if ( (SwFlowFrame::IsMoveBwdJump() || !IsPrevObjMove()) ) + if ( SwFlowFrame::IsMoveBwdJump() || !IsPrevObjMove() ) { //Floating back Frame's is quite time consuming unfortunately. //Most often the location where the Frame wants to float to has the same diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 41221d2300bd..999bc8897c1d 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -664,10 +664,10 @@ static const SwContentFrame * lcl_MissProtectedFrames( const SwContentFrame *pCn while ( pCell && !pCell->IsCellFrame() ) pCell = pCell->GetUpper(); if ( !pCell || - (( ( bInReadOnly || !pCell->GetFormat()->GetProtect().IsContentProtected() ) && + ( ( bInReadOnly || !pCell->GetFormat()->GetProtect().IsContentProtected() ) && ( !bMissHeadline || !lcl_IsInRepeatedHeadline( pCell ) ) && ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) && - !pCell->IsCoveredCell()) ) ) + !pCell->IsCoveredCell() ) ) bProtect = false; else pCnt = (*fnNxtPrv)( pCnt ); diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 268914f3abd8..a228cddf6bae 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -71,11 +71,11 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() // bottom, if its wrap mode is 'through' and its anchor frame has fixed // size. Otherwise, it's positioned top. sal_Int16 eVertOrient = aVert.GetVertOrient(); - if ( ( bFlyAtFly && - ( eVertOrient == text::VertOrientation::CENTER || - eVertOrient == text::VertOrientation::BOTTOM ) && + if ( bFlyAtFly && + ( eVertOrient == text::VertOrientation::CENTER || + eVertOrient == text::VertOrientation::BOTTOM ) && css::text::WrapTextMode_THROUGH != rFrameFormat.GetSurround().GetSurround() && - !GetAnchorFrame().HasFixSize() ) ) + !GetAnchorFrame().HasFixSize() ) { eVertOrient = text::VertOrientation::TOP; } diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index ef262333c4a7..cd76aa2a0b13 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -307,7 +307,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, // 6168: Avoid that the rest of a FieldPortion gets the attributes of the // next portion with SeekAndChgBefore(): - if( ( bRest && pPor->InFieldGrp() && !pPor->GetLen() ) ) + if( bRest && pPor->InFieldGrp() && !pPor->GetLen() ) SeekAndChgBefore( GetInfo() ); else if ( pPor->IsQuoVadisPortion() ) { diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 616a591b169e..136955fdcad5 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -187,10 +187,12 @@ void SwFormatField::ClearTextField() bool SwFormatField::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( ( mpField && static_cast<const SwFormatField&>(rAttr).GetField() - && mpField->GetTyp() == static_cast<const SwFormatField&>(rAttr).GetField()->GetTyp() - && mpField->GetFormat() == static_cast<const SwFormatField&>(rAttr).GetField()->GetFormat() ) ) - || ( !mpField && !static_cast<const SwFormatField&>(rAttr).GetField() ); + return ( mpField + && static_cast<const SwFormatField&>(rAttr).GetField() + && mpField->GetTyp() == static_cast<const SwFormatField&>(rAttr).GetField()->GetTyp() + && mpField->GetFormat() == static_cast<const SwFormatField&>(rAttr).GetField()->GetFormat() ) + || + ( !mpField && !static_cast<const SwFormatField&>(rAttr).GetField() ); } SfxPoolItem* SwFormatField::Clone( SfxItemPool* ) const diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index e304ec606597..8aefa0d6077e 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -3224,7 +3224,7 @@ bool SwpHints::TryInsertHint( // multiple times // FME 2007-11-08 #i82989# in NOHINTADJUST mode, we want to insert // character attributes directly - if ( ( RES_TXTATR_CHARFMT == nWhich && !bNoHintAdjustMode ) ) + if ( RES_TXTATR_CHARFMT == nWhich && !bNoHintAdjustMode ) { BuildPortions( rNode, *pHint, nMode ); } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index e497972a948c..78266380d0fd 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1890,8 +1890,8 @@ void HTMLTable::SetBorders() { (*m_pRows)[m_nRows-1]->bBottomBorder = true; } - if( (HTMLTableFrame::RHS==m_eFrame || HTMLTableFrame::VSides==m_eFrame || - HTMLTableFrame::Box==m_eFrame) ) + if( HTMLTableFrame::RHS==m_eFrame || HTMLTableFrame::VSides==m_eFrame || + HTMLTableFrame::Box==m_eFrame ) m_bRightBorder = true; if( HTMLTableFrame::LHS==m_eFrame || HTMLTableFrame::VSides==m_eFrame || HTMLTableFrame::Box==m_eFrame ) { @@ -2224,11 +2224,14 @@ void HTMLTable::CloseTable() HTMLTableRow *const pPrevRow = (*m_pRows)[m_nCurrentRow-1].get(); HTMLTableCell *pCell; for( i=0; i<m_nCols; i++ ) - if( ( (pCell=(pPrevRow->GetCell(i))), (pCell->GetRowSpan()) > 1 ) ) + { + pCell = pPrevRow->GetCell(i); + if( pCell->GetRowSpan() > 1 ) { FixRowSpan( m_nCurrentRow-1, i, pCell->GetContents() ); ProtectRowSpan(m_nCurrentRow, i, (*m_pRows)[m_nCurrentRow]->GetCell(i)->GetRowSpan()); } + } for( i=m_nRows-1; i>=m_nCurrentRow; i-- ) m_pRows->erase(m_pRows->begin() + i); m_nRows = m_nCurrentRow; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 1ae6990ab51c..93b6d5b609bf 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -3677,8 +3677,8 @@ void SwHTMLParser::NewFontAttr( HtmlTokenId nToken ) // In headings the current heading sets the font height // and not BASEFONT. sal_uInt16 nPoolId = GetCurrFormatColl()->GetPoolFormatId(); - if( (nPoolId>=RES_POOLCOLL_HEADLINE1 && - nPoolId<=RES_POOLCOLL_HEADLINE6) ) + if( nPoolId>=RES_POOLCOLL_HEADLINE1 && + nPoolId<=RES_POOLCOLL_HEADLINE6 ) { // If the font height in the heading wasn't changed yet, // then take the one from the style. diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 1986429414b2..6ad2e8703a35 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -449,8 +449,8 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) // Otherwise, an additional paragraph is exported for a graphic, which is // forced to be treated as inline, because it's anchored inside another frame. if ( !rFrame.IsInline() && - ( ((eAn == RndStdIds::FLY_AT_PARA)) || - (eAn == RndStdIds::FLY_AT_PAGE)) ) + ( (eAn == RndStdIds::FLY_AT_PARA) || + (eAn == RndStdIds::FLY_AT_PAGE) ) ) { WriteChar( (char)0x0d ); // close the surrounding frame with CR diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 77009b764fed..1567b40e4676 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -258,7 +258,7 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell* pDocShell, s { rStrm.ReadBytes(aGuid, 16); - if( (memcmp(aGuid, aGuidFileMoniker, 16) == 0) ) + if( memcmp(aGuid, aGuidFileMoniker, 16) == 0 ) { rStrm.ReadUInt16( nLevel ); xShortName.reset(new OUString(read_uInt32_lenPrefixed_uInt8s_ToOUString(rStrm, GetCharSetFromLanguage()))); @@ -278,7 +278,7 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell* pDocShell, s else lclGetAbsPath( *xShortName, nLevel, pDocShell); } - else if( (memcmp(aGuid, aGuidUrlMoniker, 16) == 0) ) + else if( memcmp(aGuid, aGuidUrlMoniker, 16) == 0 ) { sal_uInt32 nStrLen(0); rStrm.ReadUInt32( nStrLen ); @@ -4462,7 +4462,7 @@ void wwSectionManager::InsertSegments() (aIter->GetPageHeight() == aNext->GetPageHeight()) && (aIter->IsLandScape() == aNext->IsLandScape())); - if (((aNext != aEnd && aNext->IsContinuous() && bThisAndNextAreCompatible) || bProtected)) + if ((aNext != aEnd && aNext->IsContinuous() && bThisAndNextAreCompatible) || bProtected) { bIgnoreCols = true; if ((aIter->NoCols() > 1) || bProtected) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index ddff8244e7f7..bc244fe62acb 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -526,10 +526,8 @@ void wwSectionManager::GetPageULData(const wwSection &rSection, even pages, something we cannot do. So we will put it on top of all pages, that way the pages are at least the right size. */ - if ( - (!mrReader.m_bVer67 && mrReader.m_pWDop->iGutterPos && + if (!mrReader.m_bVer67 && mrReader.m_pWDop->iGutterPos && rSection.maSep.fRTLGutter) - ) { nWWUp += rSection.maSep.dzaGutter; } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0341eb26eb80..6e75c781bdde 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1107,7 +1107,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) if( nSprmId ) { // move Sprm Id and Sprm Param to internal mini storage: - aShortSprm[0] = (sal_uInt8)( ( nSprmId & 0x00ff) ); + aShortSprm[0] = (sal_uInt8) ( nSprmId & 0x00ff) ; aShortSprm[1] = (sal_uInt8)( ( nSprmId & 0xff00) >> 8 ); aShortSprm[2] = (sal_uInt8)( nPrm >> 8 ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e12627b4c656..d05820fa1115 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -613,7 +613,7 @@ void SwXMLImport::startDocument() GetTextImport()->SetCursor( xTextCursor ); } - if( (!(getImportFlags() & (SvXMLImportFlags::CONTENT|SvXMLImportFlags::MASTERSTYLES)))) + if( !(getImportFlags() & (SvXMLImportFlags::CONTENT|SvXMLImportFlags::MASTERSTYLES)) ) return; if( !pTextCursor ) @@ -848,7 +848,7 @@ void SwXMLImport::endDocument() // SJ: #i49801# -> now permitting repaints if ( pDoc ) { - if( (getImportFlags() == SvXMLImportFlags::ALL ) ) + if( getImportFlags() == SvXMLImportFlags::ALL ) { // Notify math objects. If we are in the package filter this will // be done by the filter object itself diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index ee094fceaa01..d06f31b66d4f 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1913,9 +1913,11 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, SwXMLTableRow_Impl *pStartRow = (*m_pRows)[nStartRow].get(); const SwXMLTableCell_Impl *pCell; for( i=nLeftCol; i<nRightCol; i++ ) - if( ( pCell=pStartRow->GetCell(i), - pCell->GetRowSpan() > nMaxRowSpan ) ) + { + pCell = pStartRow->GetCell(i); + if( pCell->GetRowSpan() > nMaxRowSpan ) nMaxRowSpan = pCell->GetRowSpan(); + } nStartRow += nMaxRowSpan; if( nStartRow<nBottomRow ) @@ -2332,7 +2334,8 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) const SwXMLTableCell_Impl *pCell; for( sal_uLong i = 0; i < m_aColumnWidths.size(); ++i ) { - if( ( pCell=pPrevRow->GetCell(i), pCell->GetRowSpan() > 1UL ) ) + pCell = pPrevRow->GetCell(i); + if( pCell->GetRowSpan() > 1 ) { FixRowSpan( m_nCurRow-1UL, i, 1UL ); } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 527052c9c996..f38c0d7fdf96 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -336,7 +336,7 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit) //centered: change both sides equally else if(m_pCenterBtn->IsChecked()) { - if((nLeft != nRight)) + if(nLeft != nRight) { nDiff += nLeft + nRight; nLeft = nDiff/2; diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index 6b9c577ac369..41a87cf6463e 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -100,7 +100,7 @@ void SAL_CALL SwVbaColumns::Select( ) uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) { sal_Int32 nIndex = 0; - if( ( Index1 >>= nIndex ) ) + if( Index1 >>= nIndex ) { if( nIndex <= 0 || nIndex > getCount() ) { diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index 30ef9d2f1ca2..1627631ec39d 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -55,7 +55,7 @@ SwVbaListGalleries::SwVbaListGalleries( const uno::Reference< XHelperInterface > uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) { sal_Int32 nIndex = 0; - if( ( Index1 >>= nIndex ) ) + if( Index1 >>= nIndex ) { if( nIndex == word::WdListGalleryType::wdBulletGallery || nIndex == word::WdListGalleryType::wdNumberGallery diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index ac08e16e9726..cfe3b862d3aa 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -317,7 +317,7 @@ void SAL_CALL SwVbaRows::Select( ) uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) { sal_Int32 nIndex = 0; - if( ( Index1 >>= nIndex ) ) + if( Index1 >>= nIndex ) { if( nIndex <= 0 || nIndex > getCount() ) { diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 494857f069a4..5150e4dd22af 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -940,9 +940,9 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, Con { if(pViewShell->GetWindow()) { - if((dynamic_cast< const SwView *>( pViewShell ) != nullptr || - dynamic_cast< const SwPagePreview *>( pViewShell ) != nullptr || - dynamic_cast< const SwSrcView *>( pViewShell ) != nullptr)) + if(dynamic_cast< const SwView *>( pViewShell ) != nullptr || + dynamic_cast< const SwPagePreview *>( pViewShell ) != nullptr || + dynamic_cast< const SwSrcView *>( pViewShell ) != nullptr) { if(bAccessibility) { diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 0c94290af8b8..f73ea02ddca5 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -219,7 +219,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) } else if( rReq.GetSlot() == SID_PRINTDOCDIRECT && ! bSilent ) { - if( ( pSh->IsSelection() || pSh->IsFrameSelected() || pSh->IsObjSelected() ) ) + if( pSh->IsSelection() || pSh->IsFrameSelected() || pSh->IsObjSelected() ) { short nBtn = ScopedVclPtrInstance<SvxPrtQryBox>(&GetEditWin())->Execute(); if( RET_CANCEL == nBtn ) diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 775741fe6588..9a63b496b8f1 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1163,7 +1163,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption if ( rProp.Name == UNO_NAME_FILE_NAME ) { OUString sFileURL; - if ( (rProp.Value >>= sFileURL ) ) + if ( rProp.Value >>= sFileURL ) { // Convert the File URL into a system dependent path, as the SalPrinter expects OUString sSystemPath; diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index aa30b63e9f14..f6c0c463483f 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -590,7 +590,7 @@ void SAL_CALL SwXTextView::setRubyList( } else if(pProperties[nProp].Name == UNO_NAME_RUBY_CHAR_STYLE_NAME) { - if((pProperties[nProp].Value >>= sTmp)) + if(pProperties[nProp].Value >>= sTmp) { OUString sName; SwStyleNameMapper::FillUIName(sTmp, sName, SwGetPoolIdFromName::ChrFmt, true ); @@ -605,7 +605,7 @@ void SAL_CALL SwXTextView::setRubyList( else if(pProperties[nProp].Name == UNO_NAME_RUBY_ADJUST) { sal_Int16 nTmp = 0; - if((pProperties[nProp].Value >>= nTmp)) + if(pProperties[nProp].Value >>= nTmp) pEntry->GetRubyAttr().SetAdjustment((css::text::RubyAdjust)nTmp); } else if(pProperties[nProp].Name == UNO_NAME_RUBY_IS_ABOVE) diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 4be4e226be6d..88862a02a7b2 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1401,7 +1401,7 @@ bool SwContentTree::Expand( SvTreeListEntry* pParent ) } else m_nHiddenBlock |= nOr; - if((pCntType->GetType() == ContentTypeId::OUTLINE)) + if(pCntType->GetType() == ContentTypeId::OUTLINE) { std::map< void*, bool > aCurrOutLineNodeMap; diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index a46b76f4b374..8675c490610e 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -1063,7 +1063,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt ) if (-1 != sFileName.indexOf('#')) return nRet; - if ((m_sContentFileName.isEmpty() || m_sContentFileName != sFileName)) + if (m_sContentFileName.isEmpty() || m_sContentFileName != sFileName) { nRet = rEvt.mnAction; sFileName = comphelper::string::stripEnd(sFileName, 0); |