diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:05:21 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 09:05:21 +0000 |
commit | 1c1008127a2f12d6537f2ba5900fd1f6684b0953 (patch) | |
tree | 6fd36d3037117185917136bf602f245193b74d27 /svtools | |
parent | 547f8a0c01ceac9a58bf91bb6b3dc220edc33648 (diff) |
INTEGRATION: CWS oj14 (1.47.26); FILE MERGED
2007/02/15 14:17:05 pl 1.47.26.1: #74191# enable PaintTransparent MultiLineEdit
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/edit/texteng.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 0a970a71822d..bfab03694c43 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -4,9 +4,9 @@ * * $RCSfile: texteng.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: hr $ $Date: 2007-06-27 21:31:32 $ + * last change: $Author: rt $ $Date: 2007-07-06 10:05:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1649,7 +1649,7 @@ void TextEngine::UpdateViews( TextView* pCurView ) aClipRec.SetPos( aNewPos ); if ( pView == pCurView ) - pView->ImpPaint( aClipRec, TRUE ); + pView->ImpPaint( aClipRec, !pView->GetWindow()->IsPaintTransparent() ); else pView->GetWindow()->Invalidate( aClipRec ); } @@ -2098,6 +2098,10 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan if ( !IsFormatted() ) FormatDoc(); + bool bTransparent = false; + Window* pOutWin = dynamic_cast<Window*>(pOutDev); + bTransparent = (pOutWin && pOutWin->IsPaintTransparent()); + long nY = rStartPos.Y(); TextPaM const* pSelStart = 0; @@ -2169,7 +2173,9 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan { Font aFont; SeekCursor( nPara, nIndex+1, aFont, pOutDev ); - if ( pSelection ) + if( bTransparent ) + aFont.SetTransparent( TRUE ); + else if ( pSelection ) aFont.SetTransparent( FALSE ); pOutDev->SetFont( aFont ); |