diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 11:09:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 11:09:32 +0000 |
| commit | d586be7ea38ddc73a8767ef56d5f735b69533c31 (patch) | |
| tree | 1a04de1b6abfa78dd937fb3546048ea084e464ca /basctl/source | |
| parent | 38f30ab057a6273ff0451a70ff499cc505fe22d7 (diff) | |
INTEGRATION: CWS aw046 (1.46.10); FILE MERGED
2007/04/26 10:13:38 aw 1.46.10.5: #i74769#
2007/04/23 22:14:39 aw 1.46.10.4: RESYNC: (1.46-1.47); FILE MERGED
2007/04/05 14:18:15 aw 1.46.10.3: #i74769# Scroll needs to move the child windows which are FormControls
2007/04/03 14:27:01 aw 1.46.10.2: #i74769#
2007/02/26 17:22:16 aw 1.46.10.1: #i74769# use Begin/EndDrawLayer() support of direct use of SdrPaintWindow and PreRenderDevice
Diffstat (limited to 'basctl/source')
| -rw-r--r-- | basctl/source/dlged/dlged.cxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 20d7648e5b93..d96cbbdead42 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dlged.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: kz $ $Date: 2007-06-20 10:39:15 $ + * last change: $Author: hr $ $Date: 2007-06-26 12:09:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -155,6 +155,11 @@ #include <toolkit/helper/vclunohelper.hxx> #endif +// #i74769# +#ifndef _SDRPAINTWINDOW_HXX +#include <svx/sdrpaintwindow.hxx> +#endif + using namespace comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -462,7 +467,8 @@ void DlgEditor::DoScroll( ScrollBar* ) // Wallpaper aOldBackground = pWindow->GetBackground(); // pWindow->SetBackground(); - pWindow->Scroll( -nX, -nY, SCROLL_NOCHILDREN ); + // #i74769# children should be scrolled + pWindow->Scroll( -nX, -nY, SCROLL_CHILDREN); // SCROLL_NOCHILDREN ); aMap.SetOrigin( Point( -aScrollPos.Width(), -aScrollPos.Height() ) ); pWindow->SetMapMode( aMap ); pWindow->Update(); @@ -712,10 +718,14 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG ) SdrPageView* pPgView = pDlgEdView->GetSdrPageView(); const Region aPaintRectRegion(aPaintRect); + // #i74769# + SdrPaintWindow* pTargetPaintWindow = 0; + // mark repaint start if(pPgView) { - pPgView->GetView().BeginDrawLayers(pWindow, aPaintRectRegion, sal_False); + pTargetPaintWindow = pPgView->GetView().BeginDrawLayers(pWindow, aPaintRectRegion); + OSL_ENSURE(pTargetPaintWindow, "BeginDrawLayers: Got no SdrPaintWindow (!)"); } // draw background self using wallpaper @@ -728,7 +738,7 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG ) if(pPgView) { pPgView->DrawLayer(0, pWindow); - pPgView->GetView().EndDrawLayers(pWindow); + pPgView->GetView().EndDrawLayers(*pTargetPaintWindow); } nInPaint = FALSE; |