diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-03-12 09:46:46 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-03-12 09:46:46 +0200 |
commit | 5a2cfa677356f77cda15365dd9107ce503e11dd4 (patch) | |
tree | 8c6c2dab7dbde2ee766e2869cbeb1062d0d88d1a /vcl | |
parent | 3ce934bfc910af626baa985fa37f9a7ee08ad473 (diff) |
Abbreviate Rectangle as Rect, not Rec
Change-Id: If38a5d23150bcd19a6eb6024c2ef1eea826898f5
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/vcl/texteng.hxx | 2 | ||||
-rw-r--r-- | vcl/source/edit/texteng.cxx | 42 | ||||
-rw-r--r-- | vcl/source/edit/textview.cxx | 28 |
3 files changed, 36 insertions, 36 deletions
diff --git a/vcl/inc/vcl/texteng.hxx b/vcl/inc/vcl/texteng.hxx index 2fc0314e7abc..85b5a7b59a25 100644 --- a/vcl/inc/vcl/texteng.hxx +++ b/vcl/inc/vcl/texteng.hxx @@ -104,7 +104,7 @@ private: ::com::sun::star::lang::Locale maLocale; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIterator; - Rectangle maInvalidRec; + Rectangle maInvalidRect; Range maInvalidRange; LocaleDataWrapper* mpLocaleDataWrapper; diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 487d83e24970..2372768f8e60 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1507,7 +1507,7 @@ void TextEngine::TextModified() void TextEngine::UpdateViews( TextView* pCurView ) { - if ( !GetUpdateMode() || IsFormatting() || maInvalidRec.IsEmpty() ) + if ( !GetUpdateMode() || IsFormatting() || maInvalidRect.IsEmpty() ) return; DBG_ASSERT( IsFormatted(), "UpdateViews: Doc nicht formatiert!" ); @@ -1517,22 +1517,22 @@ void TextEngine::UpdateViews( TextView* pCurView ) TextView* pView = (*mpViews)[ nView ]; pView->HideCursor(); - Rectangle aClipRec( maInvalidRec ); + Rectangle aClipRect( maInvalidRect ); Size aOutSz = pView->GetWindow()->GetOutputSizePixel(); Rectangle aVisArea( pView->GetStartDocPos(), aOutSz ); - aClipRec.Intersection( aVisArea ); - if ( !aClipRec.IsEmpty() ) + aClipRect.Intersection( aVisArea ); + if ( !aClipRect.IsEmpty() ) { // in Fensterkoordinaten umwandeln.... - Point aNewPos = pView->GetWindowPos( aClipRec.TopLeft() ); + Point aNewPos = pView->GetWindowPos( aClipRect.TopLeft() ); if ( IsRightToLeft() ) aNewPos.X() -= aOutSz.Width() - 1; - aClipRec.SetPos( aNewPos ); + aClipRect.SetPos( aNewPos ); if ( pView == pCurView ) - pView->ImpPaint( aClipRec, !pView->GetWindow()->IsPaintTransparent() ); + pView->ImpPaint( aClipRect, !pView->GetWindow()->IsPaintTransparent() ); else - pView->GetWindow()->Invalidate( aClipRec ); + pView->GetWindow()->Invalidate( aClipRect ); } } @@ -1541,7 +1541,7 @@ void TextEngine::UpdateViews( TextView* pCurView ) pCurView->ShowCursor( pCurView->IsAutoScroll() ); } - maInvalidRec = Rectangle(); + maInvalidRect = Rectangle(); } IMPL_LINK_NOARG(TextEngine, IdleFormatHdl) @@ -1577,7 +1577,7 @@ void TextEngine::FormatDoc() long nY = 0; sal_Bool bGrow = sal_False; - maInvalidRec = Rectangle(); // leermachen + maInvalidRect = Rectangle(); // leermachen for ( sal_uLong nPara = 0; nPara < mpTEParaPortions->Count(); nPara++ ) { TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); @@ -1592,20 +1592,20 @@ void TextEngine::FormatDoc() if ( CreateLines( nPara ) ) bGrow = sal_True; - // InvalidRec nur einmal setzen... - if ( maInvalidRec.IsEmpty() ) + // InvalidRect nur einmal setzen... + if ( maInvalidRect.IsEmpty() ) { // Bei Paperwidth 0 (AutoPageSize) bleibt es sonst Empty()... long nWidth = (long)mnMaxTextWidth; if ( !nWidth ) nWidth = 0x7FFFFFFF; Range aInvRange( GetInvalidYOffsets( nPara ) ); - maInvalidRec = Rectangle( Point( 0, nY+aInvRange.Min() ), + maInvalidRect = Rectangle( Point( 0, nY+aInvRange.Min() ), Size( nWidth, aInvRange.Len() ) ); } else { - maInvalidRec.Bottom() = nY + CalcParaHeight( nPara ); + maInvalidRect.Bottom() = nY + CalcParaHeight( nPara ); } if ( mnCurTextWidth != 0xFFFFFFFF ) @@ -1619,26 +1619,26 @@ void TextEngine::FormatDoc() } else if ( bGrow ) { - maInvalidRec.Bottom() = nY + CalcParaHeight( nPara ); + maInvalidRect.Bottom() = nY + CalcParaHeight( nPara ); } nY += CalcParaHeight( nPara ); if ( !mbHasMultiLineParas && pTEParaPortion->GetLines().size() > 1 ) mbHasMultiLineParas = sal_True; } - if ( !maInvalidRec.IsEmpty() ) + if ( !maInvalidRect.IsEmpty() ) { sal_uLong nNewHeight = CalcTextHeight(); long nDiff = nNewHeight - mnCurTextHeight; if ( nNewHeight < mnCurTextHeight ) { - maInvalidRec.Bottom() = (long)Max( nNewHeight, mnCurTextHeight ); - if ( maInvalidRec.IsEmpty() ) + maInvalidRect.Bottom() = (long)Max( nNewHeight, mnCurTextHeight ); + if ( maInvalidRect.IsEmpty() ) { - maInvalidRec.Top() = 0; + maInvalidRect.Top() = 0; // Left und Right werden nicht ausgewertet, aber wegen IsEmpty gesetzt. - maInvalidRec.Left() = 0; - maInvalidRec.Right() = mnMaxTextWidth; + maInvalidRect.Left() = 0; + maInvalidRect.Right() = mnMaxTextWidth; } } diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index aa8a9d524899..ff061bbd9b69 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -371,11 +371,11 @@ void TextView::ImpPaint( const Rectangle& rRect, sal_Bool bUseVirtDev ) return; } - Rectangle aTmpRec( Point( 0, 0 ), rRect.GetSize() ); + Rectangle aTmpRect( Point( 0, 0 ), rRect.GetSize() ); Point aDocPos( mpImpl->maStartDocPos.X(), mpImpl->maStartDocPos.Y() + rRect.Top() ); Point aStartPos = ImpGetOutputStartPos( aDocPos ); - ImpPaint( pVDev, aStartPos, &aTmpRec, NULL, pDrawSelection ); + ImpPaint( pVDev, aStartPos, &aTmpRect, NULL, pDrawSelection ); mpImpl->mpWindow->DrawOutDev( rRect.TopLeft(), rRect.GetSize(), Point(0,0), rRect.GetSize(), *pVDev ); // ShowSelection(); @@ -435,15 +435,15 @@ void TextView::ImpHighlight( const TextSelection& rSel ) if ( nEndIndex < nStartIndex ) nEndIndex = nStartIndex; - Rectangle aTmpRec( mpImpl->mpTextEngine->GetEditCursor( TextPaM( nPara, nStartIndex ), sal_False ) ); - aTmpRec.Top() += nY; - aTmpRec.Bottom() += nY; - Point aTopLeft( aTmpRec.TopLeft() ); + Rectangle aTmpRect( mpImpl->mpTextEngine->GetEditCursor( TextPaM( nPara, nStartIndex ), sal_False ) ); + aTmpRect.Top() += nY; + aTmpRect.Bottom() += nY; + Point aTopLeft( aTmpRect.TopLeft() ); - aTmpRec = mpImpl->mpTextEngine->GetEditCursor( TextPaM( nPara, nEndIndex ), sal_True ); - aTmpRec.Top() += nY; - aTmpRec.Bottom() += nY; - Point aBottomRight( aTmpRec.BottomRight() ); + aTmpRect = mpImpl->mpTextEngine->GetEditCursor( TextPaM( nPara, nEndIndex ), sal_True ); + aTmpRect.Top() += nY; + aTmpRect.Bottom() += nY; + Point aBottomRight( aTmpRect.BottomRight() ); aBottomRight.X()--; // Nur Painten, wenn im sichtbaren Bereich... @@ -1682,8 +1682,8 @@ TextPaM TextView::CursorEndOfDoc() TextPaM TextView::PageUp( const TextPaM& rPaM ) { - Rectangle aRec = mpImpl->mpTextEngine->PaMtoEditCursor( rPaM ); - Point aTopLeft = aRec.TopLeft(); + Rectangle aRect = mpImpl->mpTextEngine->PaMtoEditCursor( rPaM ); + Point aTopLeft = aRect.TopLeft(); aTopLeft.Y() -= mpImpl->mpWindow->GetOutputSizePixel().Height() * 9/10; aTopLeft.X() += 1; if ( aTopLeft.Y() < 0 ) @@ -1695,8 +1695,8 @@ TextPaM TextView::PageUp( const TextPaM& rPaM ) TextPaM TextView::PageDown( const TextPaM& rPaM ) { - Rectangle aRec = mpImpl->mpTextEngine->PaMtoEditCursor( rPaM ); - Point aBottomRight = aRec.BottomRight(); + Rectangle aRect = mpImpl->mpTextEngine->PaMtoEditCursor( rPaM ); + Point aBottomRight = aRect.BottomRight(); aBottomRight.Y() += mpImpl->mpWindow->GetOutputSizePixel().Height() * 9/10; aBottomRight.X() += 1; long nHeight = mpImpl->mpTextEngine->GetTextHeight(); |