Kaydet (Commit) ea79b364 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Decrease scope of some variable

Change-Id: I23319e09bf6c4c0e33b86edc225cdfaa0433b7c6
üst 3b7030d9
...@@ -4673,9 +4673,6 @@ static void lcl_PaintLeftRightLine( const bool _bLeft, ...@@ -4673,9 +4673,6 @@ static void lcl_PaintLeftRightLine( const bool _bLeft,
{ {
pLeftRightBorder = bR2L ? rBox.GetLeft() : rBox.GetRight(); pLeftRightBorder = bR2L ? rBox.GetLeft() : rBox.GetRight();
} }
// OD 06.05.2003 #107169# - init boolean indicating printer output device.
const bool bPrtOutputDev =
( OUTDEV_PRINTER == pGlobalShell->GetOut()->GetOutDevType() );
if ( !pLeftRightBorder ) if ( !pLeftRightBorder )
{ {
...@@ -4694,9 +4691,7 @@ static void lcl_PaintLeftRightLine( const bool _bLeft, ...@@ -4694,9 +4691,7 @@ static void lcl_PaintLeftRightLine( const bool _bLeft,
(aRect.*_rRectFn->fnGetWidth)() ); (aRect.*_rRectFn->fnGetWidth)() );
} }
const sal_Bool bCnt = _rFrm.IsCntntFrm(); if ( _rFrm.IsCntntFrm() )
if ( bCnt )
{ {
::lcl_ExtendLeftAndRight( aRect, _rFrm, _rAttrs, _rRectFn ); ::lcl_ExtendLeftAndRight( aRect, _rFrm, _rAttrs, _rRectFn );
...@@ -4707,6 +4702,10 @@ static void lcl_PaintLeftRightLine( const bool _bLeft, ...@@ -4707,6 +4702,10 @@ static void lcl_PaintLeftRightLine( const bool _bLeft,
if ( !pLeftRightBorder->GetInWidth() ) if ( !pLeftRightBorder->GetInWidth() )
{ {
// OD 06.05.2003 #107169# - init boolean indicating printer output device.
const bool bPrtOutputDev =
( OUTDEV_PRINTER == pGlobalShell->GetOut()->GetOutDevType() );
// OD 06.05.2003 #107169# - add 6th parameter // OD 06.05.2003 #107169# - add 6th parameter
::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn, bPrtOutputDev ); ::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn, bPrtOutputDev );
} }
...@@ -4730,8 +4729,7 @@ static void lcl_PaintTopBottomLine( const bool _bTop, ...@@ -4730,8 +4729,7 @@ static void lcl_PaintTopBottomLine( const bool _bTop,
{ {
const SvxBoxItem& rBox = _rAttrs.GetBox(); const SvxBoxItem& rBox = _rAttrs.GetBox();
const SvxBorderLine* pTopBottomBorder = 0; const SvxBorderLine* pTopBottomBorder = 0;
const SvxBorderLine* pLeftBorder = rBox.GetLeft();
const SvxBorderLine* pRightBorder = rBox.GetRight();
if ( _bTop ) if ( _bTop )
{ {
pTopBottomBorder = rBox.GetTop(); pTopBottomBorder = rBox.GetTop();
...@@ -4761,7 +4759,7 @@ static void lcl_PaintTopBottomLine( const bool _bTop, ...@@ -4761,7 +4759,7 @@ static void lcl_PaintTopBottomLine( const bool _bTop,
if ( lcl_GetLineWidth( pTopBottomBorder ) > 0 ) if ( lcl_GetLineWidth( pTopBottomBorder ) > 0 )
{ {
lcl_MakeBorderLine( lcl_MakeBorderLine(
aRect, false, _bTop, *pTopBottomBorder, pLeftBorder, pRightBorder); aRect, false, _bTop, *pTopBottomBorder, rBox.GetLeft(), rBox.GetRight());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment