mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paragraph argument never used in InvalidateBullet

Browse Source 
Change-Id: I07ba855e473fb137551e70de9cfa858c5e079324
This commit is contained in:
Caolán McNamara
2014-06-13 13:55:14 +01:00
parent 5f500adec8
commit 05f90a9afe
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editeng/source/outliner/outliner.cxx
View File

@@ -795,7 +795,6 @@ void Outliner::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
bool Outliner::Expand( Paragraph* pPara ) bool Outliner::Expand( Paragraph* pPara )
{ {
if ( pParaList->HasHiddenChildren( pPara ) ) if ( pParaList->HasHiddenChildren( pPara ) )
{ {
OLUndoExpand* pUndo = 0; OLUndoExpand* pUndo = 0;
@@ -811,7 +810,7 @@ bool Outliner::Expand( Paragraph* pPara )
bIsExpanding = true; bIsExpanding = true;
pParaList->Expand( pPara ); pParaList->Expand( pPara );
ExpandHdl(); ExpandHdl();
InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) ); InvalidateBullet(pParaList->GetAbsPos(pPara));
if( bUndo ) if( bUndo )
{ {
InsertUndo( pUndo ); InsertUndo( pUndo );
@@ -822,7 +821,6 @@ bool Outliner::Expand( Paragraph* pPara )
return false; return false;
} }
bool Outliner::Collapse( Paragraph* pPara ) bool Outliner::Collapse( Paragraph* pPara )
{ {
if ( pParaList->HasVisibleChildren( pPara ) ) // expanded if ( pParaList->HasVisibleChildren( pPara ) ) // expanded
@@ -844,7 +842,7 @@ bool Outliner::Collapse( Paragraph* pPara )
bIsExpanding = false; bIsExpanding = false;
pParaList->Collapse( pPara ); pParaList->Collapse( pPara );
ExpandHdl(); ExpandHdl();
InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) ); InvalidateBullet(pParaList->GetAbsPos(pPara));
if( bUndo ) if( bUndo )
{ {
InsertUndo( pUndo ); 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 ); long nLineHeight = (long)pEditEngine->GetLineHeight(nPara );
for ( size_t i = 0, n = aViewList.size(); i < n; ++i ) for ( size_t i = 0, n = aViewList.size(); i < n; ++i )
{ {

2
editeng/source/outliner/outlvw.cxx
View File

@@ -529,7 +529,7 @@ void OutlinerView::Indent( short nDiff )
pPrev = pOwner->pParaList->GetParent( pPrev ); pPrev = pOwner->pParaList->GetParent( pPrev );
pOwner->Expand( pPrev ); pOwner->Expand( pPrev );
pOwner->InvalidateBullet( pPrev, pOwner->pParaList->GetAbsPos( pPrev ) ); pOwner->InvalidateBullet(pOwner->pParaList->GetAbsPos(pPrev));
} }
} }

2
include/editeng/outliner.hxx
View File

@@ -650,7 +650,7 @@ protected:
virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); virtual void StyleSheetChanged( SfxStyleSheet* pStyle );
void InvalidateBullet( Paragraph* pPara, sal_Int32 nPara ); void InvalidateBullet(sal_Int32 nPara);
void PaintBullet( sal_Int32 nPara, const Point& rStartPos, void PaintBullet( sal_Int32 nPara, const Point& rStartPos,
const Point& rOrigin, short nOrientation, const Point& rOrigin, short nOrientation,
OutputDevice* pOutDev ); OutputDevice* pOutDev );