diff options
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/oox/pagesettings.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/rtf/rtfparse.cxx | 7 | ||||
-rw-r--r-- | sc/source/filter/starcalc/scflt.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaaxes.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbacondition.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 4 |
14 files changed, 22 insertions, 23 deletions
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 178237899f52..cc433f9ceb8a 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -1135,7 +1135,7 @@ XclImpDecrypterRef lclReadFilepass8_Strong(XclImpStream& rStream) sal_uInt32 nHeaderSize = rStream.ReaduInt32(); sal_uInt32 actualHeaderSize = sizeof(info.header); - if( (nHeaderSize < actualHeaderSize) ) + if( nHeaderSize < actualHeaderSize ) return xDecr; info.header.flags = rStream.ReaduInt32(); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index f8455ba868b7..8a8403f9b9e4 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -2269,7 +2269,7 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const XclImpCheckBoxObj::DoProcessControl( rPropSet ); // TODO: grouping XclImpOptionButtonObj* pTbxObj = dynamic_cast< XclImpOptionButtonObj* >( GetObjectManager().GetSheetDrawing( GetTab() ).FindDrawObj( mnNextInGroup ).get() ); - if ( ( pTbxObj && pTbxObj->mnFirstInGroup ) ) + if ( pTbxObj && pTbxObj->mnFirstInGroup ) { // Group has terminated // traverse each RadioButton in group and diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index fe5ff212e341..eb40ec2e40e5 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -927,7 +927,7 @@ void PageSettingsConverter::writePageSettingsProperties( awt::Size aSize; bool bValid = false; - if( (0 < rModel.mnPaperSize) ) + if( 0 < rModel.mnPaperSize ) { const msfilter::util::ApiPaperSize& rPaperSize = msfilter::util::PaperSizeConv::getApiSizeForMSPaperSizeIndex( rModel.mnPaperSize ); aSize = awt::Size( rPaperSize.mnWidth, rPaperSize.mnHeight ); diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index b0acfa840f7e..779b470d878c 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -1379,10 +1379,10 @@ ApiBorderData::ApiBorderData() : bool ApiBorderData::hasAnyOuterBorder() const { return - ( ( lcl_isBorder( maTop ) && maTop.OuterLineWidth > 0 ) ) || - ( ( lcl_isBorder( maBottom ) && maBottom.OuterLineWidth > 0 ) ) || - ( ( lcl_isBorder( maLeft ) && maLeft.OuterLineWidth > 0 ) ) || - ( ( lcl_isBorder( maRight ) && maRight.OuterLineWidth > 0 ) ); + ( lcl_isBorder( maTop ) && maTop.OuterLineWidth > 0 ) || + ( lcl_isBorder( maBottom ) && maBottom.OuterLineWidth > 0 ) || + ( lcl_isBorder( maLeft ) && maLeft.OuterLineWidth > 0 ) || + ( lcl_isBorder( maRight ) && maRight.OuterLineWidth > 0 ); } namespace { diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index 523b2ef32c54..a846b4aee99b 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -66,14 +66,13 @@ ErrCode ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL ) { ScEEParseEntry* pE = maList.back(); if ( // Completely empty - ( ( pE->aSel.nStartPara == pE->aSel.nEndPara + ( pE->aSel.nStartPara == pE->aSel.nEndPara && pE->aSel.nStartPos == pE->aSel.nEndPos - ) + ) || // Empty paragraph - ( pE->aSel.nStartPara + 1 == pE->aSel.nEndPara + ( pE->aSel.nStartPara + 1 == pE->aSel.nEndPara && pE->aSel.nStartPos == pEdit->GetTextLen( pE->aSel.nStartPara ) && pE->aSel.nEndPos == 0 - ) ) ) { // Don't take over the last paragraph diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 5a190339f550..1a6ad39e0ff5 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -1203,7 +1203,7 @@ void Sc10Import::LoadPatternCollection() rItemSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) ); sal_Int16 Margin = std::max( ( sal_uInt16 ) 20, ( sal_uInt16 ) ( EJustify * 20 ) ); - if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) ) + if( ( OJustify & ojBottomTop ) == ojBottomTop ) rItemSet.Put( SvxMarginItem( 20, Margin, 20, Margin, ATTR_MARGIN ) ); else rItemSet.Put( SvxMarginItem( Margin, 20, Margin, 20, ATTR_MARGIN ) ); diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index d7e9f3107b75..da912fa76523 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -1195,7 +1195,7 @@ void ScXMLTableRowCellContext::AddTextAndValueCell( const ScAddress& rCellPos, } if( cellExists(rCurrentPos) ) { - if( ( !(bIsCovered) || isEmptyOrNote(rXMLImport.GetDocument(), rCurrentPos) ) ) + if( !bIsCovered || isEmptyOrNote(rXMLImport.GetDocument(), rCurrentPos) ) { switch (nCellType) { diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 439a2d55838c..8cdfb63c1d05 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -4931,7 +4931,7 @@ void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uIn if( nullptr != (pItem = pPool->GetItem2( nAttrib, i ) ) ) { const SvXMLAttrContainerItem *pUnknown(static_cast<const SvXMLAttrContainerItem *>(pItem)); - if( (pUnknown->GetAttrCount() > 0) ) + if( pUnknown->GetAttrCount() > 0 ) { sal_uInt16 nIdx(pUnknown->GetFirstNamespaceIndex()); while( USHRT_MAX != nIdx ) diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index fd501a44030b..c514f914c2bd 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -146,7 +146,7 @@ struct ScShapeDataLess { uno::Any aPropAny = xProps->getPropertyValue(msLayerId); sal_Int16 nLayerID = 0; - if( (aPropAny >>= nLayerID) ) + if( aPropAny >>= nLayerID ) { if (SdrLayerID(nLayerID) == SC_LAYER_BACK) bResult = true; @@ -1557,7 +1557,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) if (mpChildrenShapes) mpChildrenShapes->SetDrawBroadcaster(); } - else if ((rHint.GetId() == SfxHintId::ScAccEnterEditMode)) // this event comes only on creating edit field of a cell + else if (rHint.GetId() == SfxHintId::ScAccEnterEditMode) // this event comes only on creating edit field of a cell { if (mpViewShell->GetViewData().GetEditActivePart() == meSplitPos) { diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index ff54e3168981..f7f709add1f5 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1435,7 +1435,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi { xAccessible = GetNotesChildren()->GetChild(nIndex - aCount.nBackShapes - aCount.nHeaders); } - else if ( (nIndex < aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters) ) + else if ( nIndex < aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters ) { if ( !mpFooter.is() ) { diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index d2c0a234bb55..6ab862b62556 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -218,7 +218,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // disable functions { SdrOle2Obj* pOleObj = static_cast<SdrOle2Obj*>(rMarkList.GetMark( 0 )->GetMarkedSdrObj()); if (pOleObj->GetObjRef().is() && - ((pOleObj->GetObjRef()->getStatus( pOleObj->GetAspect() ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE) ) ) + (pOleObj->GetObjRef()->getStatus( pOleObj->GetAspect() ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE) ) //TODO/LATER: why different slots in Draw and Calc? rSet.DisableItem(SID_ORIGINALSIZE); } diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index fc795d64b720..2083c97dda0c 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -69,7 +69,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: throw uno::RuntimeException("Object failure, can't access chart implementation" ); uno::Reference< beans::XPropertySet > xAxisPropertySet; - if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue))) + if ((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue)) { if ((nAxisGroup != xlPrimary) && (nAxisGroup != xlSecondary)) DebugHelper::runtimeexception(ERRCODE_BASIC_METHOD_FAILED); diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 17e2fc901c2b..08ca695e4d6d 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -41,7 +41,7 @@ ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) { sheet::ConditionOperator aRetAPIOperator = sheet::ConditionOperator_NONE; sal_Int32 nOperator = 0; - if ( (_aOperator >>= nOperator ) ) + if ( _aOperator >>= nOperator ) { switch(nOperator) { @@ -96,7 +96,7 @@ void ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) { OUString sFormula; - if ( (_aFormula1 >>= sFormula )) + if ( _aFormula1 >>= sFormula ) { mxSheetCondition->setFormula1( sFormula ); table::CellRangeAddress aCellRangeAddress = mxAddressable->getRangeAddress(); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index b1305add00f1..fdb6d5e61a9f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -211,7 +211,7 @@ static double lcl_Round2DecPlaces( double nVal ) { nVal = (nVal * (double)100); long tmp = static_cast<long>(nVal); - if ( ( ( nVal - tmp ) >= 0.5 ) ) + if ( ( nVal - tmp ) >= 0.5 ) ++tmp; nVal = tmp; nVal = nVal/100; @@ -4476,7 +4476,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const // Use the normal uno api, sometimes e.g. when you want to use ALL as the filter // we can't use refresh as the uno interface doesn't have a concept of ALL // in this case we just call the core calc functionality - - if ( ( Field >>= nField ) ) + if ( Field >>= nField ) { bool bAll = false; bool bAcceptCriteria2 = true; |