[Libreoffice-commits] core.git: editeng/inc editeng/source
Tor Lillqvist
tml at iki.fi
Tue Mar 12 00:28:55 PDT 2013
editeng/inc/editeng/editview.hxx | 4 -
editeng/inc/editeng/outliner.hxx | 2
editeng/source/editeng/editeng.cxx | 20 +++---
editeng/source/editeng/editview.cxx | 8 +-
editeng/source/editeng/impedit.cxx | 42 ++++++-------
editeng/source/editeng/impedit.hxx | 6 -
editeng/source/editeng/impedit2.cxx | 14 ++--
editeng/source/editeng/impedit3.cxx | 114 ++++++++++++++++++------------------
editeng/source/editeng/impedit4.cxx | 22 +++---
editeng/source/outliner/outlvw.cxx | 4 -
10 files changed, 118 insertions(+), 118 deletions(-)
New commits:
commit eca1592a6d7ccd47aeeeb2457695728ae7053d63
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Mar 12 09:25:32 2013 +0200
Let's abbreviate Rectangle as Rect, not Rec
(Rec is commonly used to mean Record.)
Change-Id: I19f4611948510536b2db1e0142b52a7c0a35a60b
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 9a2fa85..e84224a 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -117,12 +117,12 @@ public:
// VisArea position of the Output window.
// A size change also affects the VisArea
- void SetOutputArea( const Rectangle& rRec );
+ void SetOutputArea( const Rectangle& rRect );
const Rectangle& GetOutputArea() const;
// Document position.
// A size change also affects the VisArea
- void SetVisArea( const Rectangle& rRec );
+ void SetVisArea( const Rectangle& rRect );
const Rectangle& GetVisArea() const;
const Pointer& GetPointer() const;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 1bb0296..7df693b 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -321,7 +321,7 @@ public:
sal_uInt16 GetSelectedScriptType() const;
- void SetVisArea( const Rectangle& rRec );
+ void SetVisArea( const Rectangle& rRect );
void SetSelection( const ESelection& );
void RemoveAttribs( sal_Bool bRemoveParaAttribs = sal_False, sal_uInt16 nWhich = 0, sal_Bool bKeepLanguages = sal_False );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 6655737..27c9716 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -237,7 +237,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOri
DBG_CHKTHIS( EditEngine, 0 );
// Create with 2 points, as with positive points it will end up with
// LONGMAX as Size, Bottom and Right in the range > LONGMAX.
- Rectangle aBigRec( -0x3FFFFFFF, -0x3FFFFFFF, 0x3FFFFFFF, 0x3FFFFFFF );
+ Rectangle aBigRect( -0x3FFFFFFF, -0x3FFFFFFF, 0x3FFFFFFF, 0x3FFFFFFF );
if( pOutDev->GetConnectMetaFile() )
pOutDev->Push();
Point aStartPos( rStartPos );
@@ -246,7 +246,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOri
aStartPos.X() += GetPaperSize().Width();
aStartPos = Rotate( aStartPos, nOrientation, rStartPos );
}
- pImpEditEngine->Paint( pOutDev, aBigRec, aStartPos, sal_False, nOrientation );
+ pImpEditEngine->Paint( pOutDev, aBigRect, aStartPos, sal_False, nOrientation );
if( pOutDev->GetConnectMetaFile() )
pOutDev->Pop();
}
@@ -1873,13 +1873,13 @@ void EditEngine::StripPortions()
{
DBG_CHKTHIS( EditEngine, 0 );
VirtualDevice aTmpDev;
- Rectangle aBigRec( Point( 0, 0 ), Size( 0x7FFFFFFF, 0x7FFFFFFF ) );
+ Rectangle aBigRect( Point( 0, 0 ), Size( 0x7FFFFFFF, 0x7FFFFFFF ) );
if ( IsVertical() )
{
- aBigRec.Right() = 0;
- aBigRec.Left() = -0x7FFFFFFF;
+ aBigRect.Right() = 0;
+ aBigRect.Left() = -0x7FFFFFFF;
}
- pImpEditEngine->Paint( &aTmpDev, aBigRec, Point(), sal_True );
+ pImpEditEngine->Paint( &aTmpDev, aBigRect, Point(), sal_True );
}
void EditEngine::GetPortions( sal_uInt16 nPara, std::vector<sal_uInt16>& rList )
@@ -1975,10 +1975,10 @@ void EditEngine::SetControlWord( sal_uInt32 nWord )
pNode->DestroyWrongList();
if ( bWrongs )
{
- pImpEditEngine->aInvalidRec.Left() = 0;
- pImpEditEngine->aInvalidRec.Right() = pImpEditEngine->GetPaperSize().Width();
- pImpEditEngine->aInvalidRec.Top() = nY+1;
- pImpEditEngine->aInvalidRec.Bottom() = nY+pPortion->GetHeight()-1;
+ pImpEditEngine->aInvalidRect.Left() = 0;
+ pImpEditEngine->aInvalidRect.Right() = pImpEditEngine->GetPaperSize().Width();
+ pImpEditEngine->aInvalidRect.Top() = nY+1;
+ pImpEditEngine->aInvalidRect.Bottom() = nY+pPortion->GetHeight()-1;
pImpEditEngine->UpdateViews( pImpEditEngine->pActiveView );
}
nY += pPortion->GetHeight();
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 283b30a..d992a1f 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -320,10 +320,10 @@ Window* EditView::GetWindow() const
return pImpEditView->pOutWin;
}
-void EditView::SetVisArea( const Rectangle& rRec )
+void EditView::SetVisArea( const Rectangle& rRect )
{
DBG_CHKTHIS( EditView, 0 );
- pImpEditView->SetVisDocStartPos( rRec.TopLeft() );
+ pImpEditView->SetVisDocStartPos( rRect.TopLeft() );
}
const Rectangle& EditView::GetVisArea() const
@@ -335,10 +335,10 @@ const Rectangle& EditView::GetVisArea() const
return aRect;
}
-void EditView::SetOutputArea( const Rectangle& rRec )
+void EditView::SetOutputArea( const Rectangle& rRect )
{
DBG_CHKTHIS( EditView, 0 );
- pImpEditView->SetOutputArea( rRec );
+ pImpEditView->SetOutputArea( rRect );
// the rest here only if it is an API call:
pImpEditView->CalcAnchorPoint();
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index bc7e5e6..d4ffcba 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -219,9 +219,9 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, OutputD
if ( nEndIndex < nStartIndex )
nEndIndex = nStartIndex;
- Rectangle aTmpRec( pEditEngine->pImpEditEngine->GetEditCursor( pTmpPortion, nStartIndex ) );
- Point aTopLeft( aTmpRec.TopLeft() );
- Point aBottomRight( aTmpRec.BottomRight() );
+ Rectangle aTmpRect( pEditEngine->pImpEditEngine->GetEditCursor( pTmpPortion, nStartIndex ) );
+ Point aTopLeft( aTmpRect.TopLeft() );
+ Point aBottomRight( aTmpRect.BottomRight() );
aTopLeft.Y() += nParaStart;
aBottomRight.Y() += nParaStart;
@@ -414,12 +414,12 @@ void ImpEditView::SetSelectionMode( EESelectionMode eNewMode )
}
}
-void ImpEditView::SetOutputArea( const Rectangle& rRec )
+void ImpEditView::SetOutputArea( const Rectangle& rRect )
{
// should be better be aligned on pixels!
- Rectangle aNewRec( pOutWin->LogicToPixel( rRec ) );
- aNewRec = pOutWin->PixelToLogic( aNewRec );
- aOutArea = aNewRec;
+ Rectangle aNewRect( pOutWin->LogicToPixel( rRect ) );
+ aNewRect = pOutWin->PixelToLogic( aNewRect );
+ aOutArea = aNewRect;
if ( aOutArea.Right() < aOutArea.Left() )
aOutArea.Right() = aOutArea.Left();
if ( aOutArea.Bottom() < aOutArea.Top() )
@@ -431,10 +431,10 @@ void ImpEditView::SetOutputArea( const Rectangle& rRec )
SetScrollDiffX( (sal_uInt16)aOutArea.GetWidth() * 2 / 10 );
}
-void ImpEditView::ResetOutputArea( const Rectangle& rRec )
+void ImpEditView::ResetOutputArea( const Rectangle& rRect )
{
Rectangle aCurArea( aOutArea );
- SetOutputArea( rRec );
+ SetOutputArea( rRect );
// Invalidate surrounding areas if in update mode of the engine on sal_True
if ( !aCurArea.IsEmpty() && pEditEngine->pImpEditEngine->GetUpdateMode() )
{
@@ -960,14 +960,14 @@ Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
// rectangle ...
aVisDocStartPos = pOutWin->LogicToPixel( aVisDocStartPos );
aVisDocStartPos = pOutWin->PixelToLogic( aVisDocStartPos );
- Rectangle aRec( aOutArea );
- pOutWin->Scroll( nRealDiffX, nRealDiffY, aRec, sal_True );
+ Rectangle aRect( aOutArea );
+ pOutWin->Scroll( nRealDiffX, nRealDiffY, aRect, sal_True );
pOutWin->Update();
pCrsr->SetPos( pCrsr->GetPos() + Point( nRealDiffX, nRealDiffY ) );
if ( bVisCursor )
{
- Rectangle aCursorRec( pCrsr->GetPos(), pCrsr->GetSize() );
- if ( aOutArea.IsInside( aCursorRec ) )
+ Rectangle aCursorRect( pCrsr->GetPos(), pCrsr->GetSize() );
+ if ( aOutArea.IsInside( aCursorRect ) )
pCrsr->Show();
}
@@ -1484,13 +1484,13 @@ void ImpEditView::ShowDDCursor( const Rectangle& rRect )
GetWindow()->SetFillColor( Color(4210752) ); // GRAY BRUSH_50, OLDSV, change to DDCursor!
// Save background ...
- Rectangle aSaveRec( GetWindow()->LogicToPixel( rRect ) );
+ Rectangle aSaveRect( GetWindow()->LogicToPixel( rRect ) );
// prefer to save some more ...
- aSaveRec.Right() += 1;
- aSaveRec.Bottom() += 1;
+ aSaveRect.Right() += 1;
+ aSaveRect.Bottom() += 1;
#ifdef DBG_UTIL
- Size aNewSzPx( aSaveRec.GetSize() );
+ Size aNewSzPx( aSaveRect.GetSize() );
#endif
if ( !pDragAndDropInfo->pBackground )
{
@@ -1510,11 +1510,11 @@ void ImpEditView::ShowDDCursor( const Rectangle& rRect )
}
#endif
- aSaveRec = GetWindow()->PixelToLogic( aSaveRec );
+ aSaveRect = GetWindow()->PixelToLogic( aSaveRect );
- pDragAndDropInfo->pBackground->DrawOutDev( Point(0,0), aSaveRec.GetSize(),
- aSaveRec.TopLeft(), aSaveRec.GetSize(), *GetWindow() );
- pDragAndDropInfo->aCurSavedCursor = aSaveRec;
+ pDragAndDropInfo->pBackground->DrawOutDev( Point(0,0), aSaveRect.GetSize(),
+ aSaveRect.TopLeft(), aSaveRect.GetSize(), *GetWindow() );
+ pDragAndDropInfo->aCurSavedCursor = aSaveRect;
// Draw Cursor...
GetWindow()->DrawRect( rRect );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index a38bab1..1d99105 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -271,8 +271,8 @@ public:
Point GetWindowPos( const Point& rDocPos ) const;
Rectangle GetWindowPos( const Rectangle& rDocPos ) const;
- void SetOutputArea( const Rectangle& rRec );
- void ResetOutputArea( const Rectangle& rRec );
+ void SetOutputArea( const Rectangle& rRect );
+ void ResetOutputArea( const Rectangle& rRect );
const Rectangle& GetOutputArea() const { return aOutArea; }
sal_Bool IsVertical() const;
@@ -450,7 +450,7 @@ private:
// For Formatting / Update ....
boost::ptr_vector<DeletedNodeInfo> aDeletedNodes;
- Rectangle aInvalidRec;
+ Rectangle aInvalidRect;
sal_uInt32 nCurTextHeight;
sal_uInt32 nCurTextHeightNTP; // without trailing empty paragraphs
sal_uInt16 nOnePixelInRef;
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index bb7ad6c..9edd00f 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -639,10 +639,10 @@ void ImpEditEngine::SetText( const XubString& rText )
// => The text remains.
if ( !rText.Len() && GetUpdateMode() )
{
- Rectangle aTmpRec( pView->GetOutputArea().TopLeft(),
+ Rectangle aTmpRect( pView->GetOutputArea().TopLeft(),
Size( aPaperSize.Width(), nCurTextHeight ) );
- aTmpRec.Intersection( pView->GetOutputArea() );
- pView->GetWindow()->Invalidate( aTmpRec );
+ aTmpRect.Intersection( pView->GetOutputArea() );
+ pView->GetWindow()->Invalidate( aTmpRect );
}
}
if( !rText.Len() ) { // otherwise it must be invalidated later, !bFormatted is enough.
@@ -1350,8 +1350,8 @@ EditPaM ImpEditEngine::CursorEndOfDoc()
EditPaM ImpEditEngine::PageUp( const EditPaM& rPaM, EditView* pView )
{
- Rectangle aRec = PaMtoEditCursor( rPaM );
- Point aTopLeft = aRec.TopLeft();
+ Rectangle aRect = PaMtoEditCursor( rPaM );
+ Point aTopLeft = aRect.TopLeft();
aTopLeft.Y() -= pView->GetVisArea().GetHeight() *9/10;
aTopLeft.X() += nOnePixelInRef;
if ( aTopLeft.Y() < 0 )
@@ -1363,8 +1363,8 @@ EditPaM ImpEditEngine::PageUp( const EditPaM& rPaM, EditView* pView )
EditPaM ImpEditEngine::PageDown( const EditPaM& rPaM, EditView* pView )
{
- Rectangle aRec = PaMtoEditCursor( rPaM );
- Point aBottomRight = aRec.BottomRight();
+ Rectangle aRect = PaMtoEditCursor( rPaM );
+ Point aBottomRight = aRect.BottomRight();
aBottomRight.Y() += pView->GetVisArea().GetHeight() *9/10;
aBottomRight.X() += nOnePixelInRef;
long nHeight = GetTextHeight();
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index fd88e88..dbaf736 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -274,7 +274,7 @@ static sal_Bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh ) // Fo
// ----------------------------------------------------------------------
void ImpEditEngine::UpdateViews( EditView* pCurView )
{
- if ( !GetUpdateMode() || IsFormatting() || aInvalidRec.IsEmpty() )
+ if ( !GetUpdateMode() || IsFormatting() || aInvalidRect.IsEmpty() )
return;
DBG_ASSERT( IsFormatted(), "UpdateViews: Doc not formatted!" );
@@ -285,19 +285,19 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
DBG_CHKOBJ( pView, EditView, 0 );
pView->HideCursor();
- Rectangle aClipRec( aInvalidRec );
+ Rectangle aClipRect( aInvalidRect );
Rectangle aVisArea( pView->GetVisArea() );
- aClipRec.Intersection( aVisArea );
+ aClipRect.Intersection( aVisArea );
- if ( !aClipRec.IsEmpty() )
+ if ( !aClipRect.IsEmpty() )
{
// convert to window coordinates ....
- aClipRec = pView->pImpEditView->GetWindowPos( aClipRec );
+ aClipRect = pView->pImpEditView->GetWindowPos( aClipRect );
if ( pView == pCurView )
- Paint( pView->pImpEditView, aClipRec, 0, sal_True );
+ Paint( pView->pImpEditView, aClipRect, 0, sal_True );
else
- pView->GetWindow()->Invalidate( aClipRec );
+ pView->GetWindow()->Invalidate( aClipRect );
}
}
@@ -307,7 +307,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
pCurView->ShowCursor( bGotoCursor );
}
- aInvalidRec = Rectangle();
+ aInvalidRect = Rectangle();
CallStatusHdl();
}
@@ -377,7 +377,7 @@ void ImpEditEngine::FormatDoc()
// Here already, so that not always in CreateLines...
sal_Bool bMapChanged = ImpCheckRefMapMode();
- aInvalidRec = Rectangle(); // make empty
+ aInvalidRect = Rectangle(); // make empty
for ( sal_uInt16 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
{
ParaPortion* pParaPortion = GetParaPortions()[nPara];
@@ -412,23 +412,23 @@ void ImpEditEngine::FormatDoc()
pParaPortion->SetMustRepaint( sal_False );
}
- // InvalidRec set only once...
- if ( aInvalidRec.IsEmpty() )
+ // InvalidRect set only once...
+ if ( aInvalidRect.IsEmpty() )
{
// For Paperwidth 0 (AutoPageSize) it would otherwise be Empty()...
long nWidth = Max( (long)1, ( !IsVertical() ? aPaperSize.Width() : aPaperSize.Height() ) );
Range aInvRange( GetInvalidYOffsets( pParaPortion ) );
- aInvalidRec = Rectangle( Point( 0, nY+aInvRange.Min() ),
+ aInvalidRect = Rectangle( Point( 0, nY+aInvRange.Min() ),
Size( nWidth, aInvRange.Len() ) );
}
else
{
- aInvalidRec.Bottom() = nY + pParaPortion->GetHeight();
+ aInvalidRect.Bottom() = nY + pParaPortion->GetHeight();
}
}
else if ( bGrow )
{
- aInvalidRec.Bottom() = nY + pParaPortion->GetHeight();
+ aInvalidRect.Bottom() = nY + pParaPortion->GetHeight();
}
nY += pParaPortion->GetHeight();
}
@@ -443,13 +443,13 @@ void ImpEditEngine::FormatDoc()
aStatus.GetStatusWord() |= !IsVertical() ? EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED;
if ( nNewHeight < nCurTextHeight )
{
- aInvalidRec.Bottom() = (long)Max( nNewHeight, nCurTextHeight );
- if ( aInvalidRec.IsEmpty() )
+ aInvalidRect.Bottom() = (long)Max( nNewHeight, nCurTextHeight );
+ if ( aInvalidRect.IsEmpty() )
{
- aInvalidRec.Top() = 0;
+ aInvalidRect.Top() = 0;
// Left and Right are not evaluated, are however set due to IsEmpty.
- aInvalidRec.Left() = 0;
- aInvalidRec.Right() = !IsVertical() ? aPaperSize.Width() : aPaperSize.Height();
+ aInvalidRect.Left() = 0;
+ aInvalidRect.Right() = !IsVertical() ? aPaperSize.Width() : aPaperSize.Height();
}
}
@@ -560,7 +560,7 @@ void ImpEditEngine::CheckAutoPageSize()
aSz.Width() = aInvSize.Height();
aSz.Height() = aInvSize.Width();
}
- aInvalidRec = Rectangle( Point(), aSz );
+ aInvalidRect = Rectangle( Point(), aSz );
for (size_t nView = 0; nView < aEditViews.size(); ++nView)
@@ -2825,7 +2825,7 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics
}
}
-void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aStartPos, sal_Bool bStripOnly, short nOrientation )
+void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aStartPos, sal_Bool bStripOnly, short nOrientation )
{
if ( !GetUpdateMode() && !bStripOnly )
return;
@@ -2882,8 +2882,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
long nParaHeight = pPortion->GetHeight();
sal_uInt16 nIndex = 0;
if ( pPortion->IsVisible() && (
- ( !IsVertical() && ( ( aStartPos.Y() + nParaHeight ) > aClipRec.Top() ) ) ||
- ( IsVertical() && ( ( aStartPos.X() - nParaHeight ) < aClipRec.Right() ) ) ) )
+ ( !IsVertical() && ( ( aStartPos.Y() + nParaHeight ) > aClipRect.Top() ) ) ||
+ ( IsVertical() && ( ( aStartPos.X() - nParaHeight ) < aClipRect.Right() ) ) ) )
{
// --------------------------------------------------
@@ -2930,8 +2930,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
aStartPos.X() -= nVertLineSpacing;
}
- if ( ( !IsVertical() && ( aStartPos.Y() > aClipRec.Top() ) )
- || ( IsVertical() && aStartPos.X() < aClipRec.Right() ) )
+ if ( ( !IsVertical() && ( aStartPos.Y() > aClipRect.Top() ) )
+ || ( IsVertical() && aStartPos.X() < aClipRect.Right() ) )
{
bPaintBullet = false;
@@ -2965,13 +2965,13 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
if ( !IsVertical() )
{
aTmpPos.X() = aStartPos.X() + nPortionXOffset;
- if ( aTmpPos.X() > aClipRec.Right() )
+ if ( aTmpPos.X() > aClipRect.Right() )
break; // No further output in line necessary
}
else
{
aTmpPos.Y() = aStartPos.Y() + nPortionXOffset;
- if ( aTmpPos.Y() > aClipRec.Bottom() )
+ if ( aTmpPos.Y() > aClipRect.Bottom() )
break; // No further output in line necessary
}
@@ -3578,9 +3578,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
}
// no more visible actions?
- if ( !IsVertical() && ( aStartPos.Y() >= aClipRec.Bottom() ) )
+ if ( !IsVertical() && ( aStartPos.Y() >= aClipRect.Bottom() ) )
break;
- else if ( IsVertical() && ( aStartPos.X() <= aClipRec.Left() ) )
+ else if ( IsVertical() && ( aStartPos.X() <= aClipRect.Left() ) )
break;
}
@@ -3627,16 +3627,16 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
pPDFExtOutDevData->EndStructureElement();
// no more visible actions?
- if ( !IsVertical() && ( aStartPos.Y() > aClipRec.Bottom() ) )
+ if ( !IsVertical() && ( aStartPos.Y() > aClipRect.Bottom() ) )
break;
- if ( IsVertical() && ( aStartPos.X() < aClipRec.Left() ) )
+ if ( IsVertical() && ( aStartPos.X() < aClipRect.Left() ) )
break;
}
if ( aStatus.DoRestoreFont() )
pOutDev->SetFont( aOldFont );
}
-void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, OutputDevice* pTargetDevice, sal_Bool bUseVirtDev )
+void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDevice* pTargetDevice, sal_Bool bUseVirtDev )
{
DBG_ASSERT( pView, "No View - No Paint!" );
DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
@@ -3645,14 +3645,14 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, OutputDevi
return;
// Intersection of paint area and output area.
- Rectangle aClipRec( pView->GetOutputArea() );
- aClipRec.Intersection( rRec );
+ Rectangle aClipRect( pView->GetOutputArea() );
+ aClipRect.Intersection( rRect );
OutputDevice* pTarget = pTargetDevice ? pTargetDevice : pView->GetWindow();
if ( bUseVirtDev )
{
- Rectangle aClipRecPixel( pTarget->LogicToPixel( aClipRec ) );
+ Rectangle aClipRecPixel( pTarget->LogicToPixel( aClipRect ) );
if ( !IsVertical() )
{
// etwas mehr, falls abgerundet!
@@ -3722,32 +3722,32 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, OutputDevi
DBG_ASSERT( bVDevValid, "VDef could not be enlarged!" );
if ( !bVDevValid )
{
- Paint( pView, rRec, 0, sal_False /* ohne VDev */ );
+ Paint( pView, rRect, 0, sal_False /* ohne VDev */ );
return;
}
// PaintRect for VDev not with aligned size,
// Otherwise, the line below must also be printed out:
- Rectangle aTmpRec( Point( 0, 0 ), aClipRec.GetSize() );
+ Rectangle aTmpRect( Point( 0, 0 ), aClipRect.GetSize() );
- aClipRec = pTarget->PixelToLogic( aClipRecPixel );
+ aClipRect = pTarget->PixelToLogic( aClipRecPixel );
Point aStartPos;
if ( !IsVertical() )
{
- aStartPos = aClipRec.TopLeft();
+ aStartPos = aClipRect.TopLeft();
aStartPos = pView->GetDocPos( aStartPos );
aStartPos.X() *= (-1);
aStartPos.Y() *= (-1);
}
else
{
- aStartPos = aClipRec.TopRight();
+ aStartPos = aClipRect.TopRight();
Point aDocPos( pView->GetDocPos( aStartPos ) );
- aStartPos.X() = aClipRec.GetSize().Width() + aDocPos.Y();
+ aStartPos.X() = aClipRect.GetSize().Width() + aDocPos.Y();
aStartPos.Y() = -aDocPos.X();
}
- Paint( pVDev, aTmpRec, aStartPos );
+ Paint( pVDev, aTmpRect, aStartPos );
sal_Bool bClipRegion = sal_False;
Region aOldRegion;
@@ -3765,15 +3765,15 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, OutputDevi
Point aOrigin = aOldMapMode.GetOrigin();
Point aViewPos = pView->GetOutputArea().TopLeft();
aOrigin.Move( aViewPos.X(), aViewPos.Y() );
- aClipRec.Move( -aViewPos.X(), -aViewPos.Y() );
+ aClipRect.Move( -aViewPos.X(), -aViewPos.Y() );
MapMode aNewMapMode( aOldMapMode );
aNewMapMode.SetOrigin( aOrigin );
pTarget->SetMapMode( aNewMapMode );
pTarget->SetClipRegion( Region( GetTextRanger()->GetPolyPolygon() ) );
}
- pTarget->DrawOutDev( aClipRec.TopLeft(), aClipRec.GetSize(),
- Point(0,0), aClipRec.GetSize(), *pVDev );
+ pTarget->DrawOutDev( aClipRect.TopLeft(), aClipRect.GetSize(),
+ Point(0,0), aClipRect.GetSize(), *pVDev );
if ( GetTextRanger() )
{
@@ -3811,17 +3811,17 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, OutputDevi
if ( !IsVertical() && ( pView->GetOutputArea().GetWidth() > GetPaperSize().Width() ) )
{
long nMaxX = pView->GetOutputArea().Left() + GetPaperSize().Width();
- if ( aClipRec.Left() > nMaxX )
+ if ( aClipRect.Left() > nMaxX )
return;
- if ( aClipRec.Right() > nMaxX )
- aClipRec.Right() = nMaxX;
+ if ( aClipRect.Right() > nMaxX )
+ aClipRect.Right() = nMaxX;
}
sal_Bool bClipRegion = pTarget->IsClipRegion();
Region aOldRegion = pTarget->GetClipRegion();
- pTarget->IntersectClipRegion( aClipRec );
+ pTarget->IntersectClipRegion( aClipRect );
- Paint( pTarget, aClipRec, aStartPos );
+ Paint( pTarget, aClipRect, aStartPos );
if ( bClipRegion )
pTarget->SetClipRegion( aOldRegion );
@@ -3924,7 +3924,7 @@ void ImpEditEngine::ShowParagraph( sal_uInt16 nParagraph, bool bShow )
pPPortion->SetMustRepaint( sal_True );
if ( GetUpdateMode() && !IsInUndo() && !GetTextRanger() )
{
- aInvalidRec = Rectangle( Point( 0, GetParaPortions().GetYOffset( pPPortion ) ),
+ aInvalidRect = Rectangle( Point( 0, GetParaPortions().GetYOffset( pPPortion ) ),
Point( GetPaperSize().Width(), nCurTextHeight ) );
UpdateViews( GetActiveView() );
}
@@ -3956,11 +3956,11 @@ EditSelection ImpEditEngine::MoveParagraphs( Range aOldPositions, sal_uInt16 nNe
ParaPortion* pUpperPortion = GetParaPortions().SafeGetObject( nFirstPortion );
ParaPortion* pLowerPortion = GetParaPortions().SafeGetObject( nLastPortion );
- aInvalidRec = Rectangle(); // make empty
- aInvalidRec.Left() = 0;
- aInvalidRec.Right() = aPaperSize.Width();
- aInvalidRec.Top() = GetParaPortions().GetYOffset( pUpperPortion );
- aInvalidRec.Bottom() = GetParaPortions().GetYOffset( pLowerPortion ) + pLowerPortion->GetHeight();
+ aInvalidRect = Rectangle(); // make empty
+ aInvalidRect.Left() = 0;
+ aInvalidRect.Right() = aPaperSize.Width();
+ aInvalidRect.Top() = GetParaPortions().GetYOffset( pUpperPortion );
+ aInvalidRect.Bottom() = GetParaPortions().GetYOffset( pLowerPortion ) + pLowerPortion->GetHeight();
UpdateViews( pCurView );
}
@@ -4184,7 +4184,7 @@ void ImpEditEngine::SetCharStretching( sal_uInt16 nX, sal_uInt16 nY )
{
FormatFullDoc();
// (potentially) need everything redrawn
- aInvalidRec=Rectangle(0,0,1000000,1000000);
+ aInvalidRect=Rectangle(0,0,1000000,1000000);
UpdateViews( GetActiveView() );
}
}
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 6509300..1e4ffdb 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2367,11 +2367,11 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel
EditPaM aEndPaM( pNode, nPaintTo );
Rectangle aStartCursor( PaMtoEditCursor( aStartPaM ) );
Rectangle aEndCursor( PaMtoEditCursor( aEndPaM ) );
- DBG_ASSERT( aInvalidRec.IsEmpty(), "InvalidRect set!" );
- aInvalidRec.Left() = 0;
- aInvalidRec.Right() = GetPaperSize().Width();
- aInvalidRec.Top() = aStartCursor.Top();
- aInvalidRec.Bottom() = aEndCursor.Bottom();
+ DBG_ASSERT( aInvalidRect.IsEmpty(), "InvalidRect set!" );
+ aInvalidRect.Left() = 0;
+ aInvalidRect.Right() = GetPaperSize().Width();
+ aInvalidRect.Top() = aStartCursor.Top();
+ aInvalidRect.Bottom() = aEndCursor.Bottom();
if ( pActiveView && pActiveView->HasSelection() )
{
// Then no output through VDev.
@@ -2382,14 +2382,14 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel
for (size_t nView = 0; nView < aEditViews.size(); ++nView)
{
EditView* pView = aEditViews[nView];
- Rectangle aClipRec( aInvalidRec );
- aClipRec.Intersection( pView->GetVisArea() );
- if ( !aClipRec.IsEmpty() )
+ Rectangle aClipRect( aInvalidRect );
+ aClipRect.Intersection( pView->GetVisArea() );
+ if ( !aClipRect.IsEmpty() )
{
// convert to window coordinates ....
- aClipRec.SetPos( pView->pImpEditView->GetWindowPos( aClipRec.TopLeft() ) );
+ aClipRect.SetPos( pView->pImpEditView->GetWindowPos( aClipRect.TopLeft() ) );
// If selected, then VDev ...
- Paint( pView->pImpEditView, aClipRec, 0, pView->HasSelection() );
+ Paint( pView->pImpEditView, aClipRect, 0, pView->HasSelection() );
}
}
}
@@ -2397,7 +2397,7 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel
{
UpdateViews( pActiveView );
}
- aInvalidRec = Rectangle();
+ aInvalidRect = Rectangle();
}
}
// After two corrected nodes give up the control ...
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 9ad91ba..015dd35 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1009,10 +1009,10 @@ void OutlinerView::InsertText( const XubString& rNew, sal_Bool bSelect )
pEditView->InsertText( rNew, bSelect );
}
-void OutlinerView::SetVisArea( const Rectangle& rRec )
+void OutlinerView::SetVisArea( const Rectangle& rRect )
{
DBG_CHKTHIS(OutlinerView,0);
- pEditView->SetVisArea( rRec );
+ pEditView->SetVisArea( rRect );
}
More information about the Libreoffice-commits
mailing list