diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-13 13:55:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-13 17:06:06 +0100 |
| commit | 05f90a9afe72c0fa7bcd7dbd30c27d4c41a556c4 (patch) | |
| tree | ce019adc8b67e14f17d219c41036e6465de4cfac | |
| parent | loplugin:staticcall (diff) | |
| download | core-05f90a9afe72c0fa7bcd7dbd30c27d4c41a556c4.tar.gz core-05f90a9afe72c0fa7bcd7dbd30c27d4c41a556c4.zip | |
Paragraph argument never used in InvalidateBullet
Change-Id: I07ba855e473fb137551e70de9cfa858c5e079324
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 9 | ||||
| -rw-r--r-- | editeng/source/outliner/outlvw.cxx | 2 | ||||
| -rw-r--r-- | include/editeng/outliner.hxx | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 08f0b7968876..4dcab226a65a 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -795,7 +795,6 @@ void Outliner::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) bool Outliner::Expand( Paragraph* pPara ) { - if ( pParaList->HasHiddenChildren( pPara ) ) { OLUndoExpand* pUndo = 0; @@ -811,7 +810,7 @@ bool Outliner::Expand( Paragraph* pPara ) bIsExpanding = true; pParaList->Expand( pPara ); ExpandHdl(); - InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) ); + InvalidateBullet(pParaList->GetAbsPos(pPara)); if( bUndo ) { InsertUndo( pUndo ); @@ -822,7 +821,6 @@ bool Outliner::Expand( Paragraph* pPara ) return false; } - bool Outliner::Collapse( Paragraph* pPara ) { if ( pParaList->HasVisibleChildren( pPara ) ) // expanded @@ -844,7 +842,7 @@ bool Outliner::Collapse( Paragraph* pPara ) bIsExpanding = false; pParaList->Collapse( pPara ); ExpandHdl(); - InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) ); + InvalidateBullet(pParaList->GetAbsPos(pPara)); if( bUndo ) { InsertUndo( pUndo ); @@ -1105,9 +1103,8 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos, } } -void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_Int32 nPara ) +void Outliner::InvalidateBullet(sal_Int32 nPara) { - long nLineHeight = (long)pEditEngine->GetLineHeight(nPara ); for ( size_t i = 0, n = aViewList.size(); i < n; ++i ) { diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 8684ea68724f..4d0b4b8f5ddc 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -529,7 +529,7 @@ void OutlinerView::Indent( short nDiff ) pPrev = pOwner->pParaList->GetParent( pPrev ); pOwner->Expand( pPrev ); - pOwner->InvalidateBullet( pPrev, pOwner->pParaList->GetAbsPos( pPrev ) ); + pOwner->InvalidateBullet(pOwner->pParaList->GetAbsPos(pPrev)); } } diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index bcf1791f83f8..d2de33e5d347 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -650,8 +650,8 @@ protected: virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - void InvalidateBullet( Paragraph* pPara, sal_Int32 nPara ); - void PaintBullet( sal_Int32 nPara, const Point& rStartPos, + void InvalidateBullet(sal_Int32 nPara); + void PaintBullet( sal_Int32 nPara, const Point& rStartPos, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ); |