diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-06 14:49:15 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-10 09:57:24 +0200 |
commit | 4250b25c6ae361359300ab6ccde27230f8e01039 (patch) | |
tree | 916a8420282928a92ede0760d696997550ae0840 /sd | |
parent | 2ed9a2b641682d8612b5404bd3978ed049aa0266 (diff) |
teach unnecessaryparen loplugin about identifiers
Change-Id: I5710b51e53779c222cec0bf08cd34bda330fec4b
Reviewed-on: https://gerrit.libreoffice.org/39737
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 6 |
10 files changed, 17 insertions, 17 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index e28162b9e786..65539844c4ed 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2268,7 +2268,7 @@ SdrObject* SdPage::InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, pUndoManager->AddUndoAction( new UndoObjectUserCall( *pObj ) ); } - ( /*(SdrGrafObj*)*/ pObj)->AdjustToMaxRect(rRect); + pObj->AdjustToMaxRect(rRect); pObj->SetUserCall(this); diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 5cb6a87a518f..bd19a80f2f08 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -230,8 +230,8 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ bool bNeedsSSSlideInfoAtom = !bVisible || ( mnDiaMode == 2 ) - || ( bIsSound ) - || ( bStopSound ) + || bIsSound + || bStopSound || ( eFe != css::presentation::FadeEffect_NONE ); if ( bNeedsSSSlideInfoAtom ) { diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 09f0c8b6bf33..4c07402a1039 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -2044,7 +2044,7 @@ bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColorSpac { rA = (sal_uInt8)( nColor >> 16 ); rB = (sal_uInt8)( nColor >> 8 ); - rC = (sal_uInt8)( nColor ); + rC = (sal_uInt8) nColor; } else if ( rAny >>= aHSL ) // HSL { diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index e0691464bee1..5795a339ce23 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1343,7 +1343,7 @@ void PowerPointExport::WriteAnimationNode( const FSHelperPtr& pFS, const Referen } if( pMethod ) { - (this->*(pMethod))( pFS, rXNode, xmlNodeType, bMainSeqChild ); + (this->*pMethod)( pFS, rXNode, xmlNodeType, bMainSeqChild ); return; } diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 5594d12f9504..f105358ec107 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -416,7 +416,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, bool bGe { sal_uInt32 nSOColor = *( o3tl::doAccess<sal_uInt32>(mAny) ); mnCharColor = nSOColor & 0xff00ff00; // green and hibyte - mnCharColor |= (sal_uInt8)( nSOColor ) << 16; // red and blue is switched + mnCharColor |= (sal_uInt8) nSOColor << 16; // red and blue is switched mnCharColor |= (sal_uInt8)( nSOColor >> 16 ); } meCharColor = ePropState; @@ -864,7 +864,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 { sal_uInt32 nSOColor = *o3tl::doAccess<sal_uInt32>(pPropValue[i].Value); nBulletColor = nSOColor & 0xff00ff00; // green and hibyte - nBulletColor |= (sal_uInt8)( nSOColor ) << 16; // red + nBulletColor |= (sal_uInt8) nSOColor << 16; // red nBulletColor |= (sal_uInt8)( nSOColor >> 16 ) | 0xfe000000; // blue } else if ( aPropName == "BulletRelSize" ) diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 0e268a95a08a..4a0aadfd7e02 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -689,7 +689,7 @@ void RotationPropertyBox::setValue( const Any& rValue, const OUString& ) { double fValue = 0.0; rValue >>= fValue; - long nValue = (long)(fValue); + long nValue = (long)fValue; mpMetric->SetValue( nValue ); updateMenu(); } @@ -1651,7 +1651,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar } else { - mpCBXDuration->SetValue( (fDuration)*100.0 ); + mpCBXDuration->SetValue( fDuration*100.0 ); } } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 2d362cb0ca80..6598d82377c6 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -675,7 +675,7 @@ void CustomAnimationPane::updateControls() if( bHasSpeed ) { - mpCBXDuration->SetValue( (fDuration)*100.0 ); + mpCBXDuration->SetValue( fDuration*100.0 ); } mpPBPropertyMore->Enable(); @@ -1826,7 +1826,7 @@ void CustomAnimationPane::onAdd() pDescriptor = *static_cast< CustomAnimationPresetPtr* >( pEntryData ); const double fDuration = pDescriptor->getDuration(); - mpCBXDuration->SetValue( (fDuration)*100.0 ); + mpCBXDuration->SetValue( fDuration*100.0 ); bool bHasSpeed = pDescriptor->getDuration() > 0.001; mpCBXDuration->Enable( bHasSpeed ); mpFTDuration->Enable( bHasSpeed ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index dacf464abea1..13f0db45e22a 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -858,7 +858,7 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark) rBindings.Invalidate(SID_NAVIGATOR_PAGENAME); } - return (bFound); + return bFound; } // If object is marked return true else return false. diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index acfd3a18515b..987af603506e 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -328,7 +328,7 @@ void TableValueSet::Resize() if( !m_bModal ) { - WinBits nStyle = GetStyle() & ~(WB_VSCROLL); + WinBits nStyle = GetStyle() & ~WB_VSCROLL; if( nRowCount > nVisibleRowCount ) { nStyle |= WB_VSCROLL; @@ -758,7 +758,7 @@ void TableDesignWidget::FillDesignPreviewControl() sal_Int32 nRows = (nCount+2)/3; m_pValueSet->SetColCount(nCols); m_pValueSet->SetLineCount(nRows); - WinBits nStyle = m_pValueSet->GetStyle() & ~(WB_VSCROLL); + WinBits nStyle = m_pValueSet->GetStyle() & ~WB_VSCROLL; m_pValueSet->SetStyle(nStyle); Size aSize(m_pValueSet->GetOptimalSize()); aSize.Width() += (10 * nCols); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 7e4e6f1062ed..e17bf1877ba8 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -428,7 +428,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) pPage->SetLayoutName(pExample->GetLayoutName()); // insert (page) - mrDoc.InsertPage(pPage, (sal_uInt16)(nTarget) * 2 + 1); + mrDoc.InsertPage(pPage, (sal_uInt16)nTarget * 2 + 1); if( isRecordingUndo() ) AddUndo(mrDoc.GetSdrUndoFactory().CreateUndoNewPage(*pPage)); @@ -467,7 +467,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) pNotesPage->SetPageKind(PageKind::Notes); // insert (notes page) - mrDoc.InsertPage(pNotesPage, (sal_uInt16)(nTarget) * 2 + 2); + mrDoc.InsertPage(pNotesPage, (sal_uInt16)nTarget * 2 + 2); if( isRecordingUndo() ) AddUndo(mrDoc.GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage)); @@ -1631,7 +1631,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo, void) const float fImageRatio = (float)aImageSize.Height() / (float)aImageSize.Width(); aImageSize.Width() = (long)( fImageRatio * fImageHeight ); } - aImageSize.Height() = (long)( fImageHeight ); + aImageSize.Height() = (long)fImageHeight; Point aImagePos( pInfo->mrStartPos ); aImagePos.X() += aOutSize.Width() - aImageSize.Width() - aOffset.Width() ; |