summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorAndreas Martens <ama@openoffice.org>2002-01-21 08:46:44 +0000
committerAndreas Martens <ama@openoffice.org>2002-01-21 08:46:44 +0000
commit7bf54b03e6c78f5a83d1b8b2e2581bb487d95d90 (patch)
tree9f7193499ae06dcff57a7a638abb8777f37480a4 /sw
parentc3696560a6bfe8486507837baa300aaafa10f061 (diff)
Fix #96683#: Don't forget the desktop in the virtual device
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/view/viewsh.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 7747df051192..050aa7f5528b 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewsh.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: ama $ $Date: 2001-12-12 10:54:00 $
+ * last change: $Author: ama $ $Date: 2002-01-21 09:46:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -308,9 +308,6 @@ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
SwRect aRect( (*pRegion)[ pRegion->Count() - 1 ] );
pRegion->Remove( pRegion->Count() - 1 );
- if ( bPaintsFromSystem )
- PaintDesktop( aRect );
-
BOOL bPaint = TRUE;
if ( IsEndActionByVirDev() )
{
@@ -351,6 +348,8 @@ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
aMapMode.SetOrigin( aOrigin );
pVout->SetMapMode( aMapMode );
pOut = pVout;
+ if ( bPaintsFromSystem )
+ PaintDesktop( aRect );
pLayout->Paint( aRect );
pOld->DrawOutDev( aRect.Pos(), aRect.SSize(),
aRect.Pos(), aRect.SSize(), *pVout );
@@ -364,7 +363,11 @@ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
}
}
if ( bPaint )
+ {
+ if ( bPaintsFromSystem )
+ PaintDesktop( aRect );
pLayout->Paint( aRect );
+ }
}
delete pVout;
delete pRegion;