diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 10:47:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 10:47:56 +0000 |
| commit | a45c61a856f90ff3f0108c97cf32770357fa6612 (patch) | |
| tree | d14dcf0412d322fa76dab1642056d5438d42a41d /sd/source/ui/view/viewshe2.cxx | |
| parent | 15fdddf626e72bc7b576f2371a4ef6195fb72c97 (diff) | |
INTEGRATION: CWS aw046 (1.47.86); FILE MERGED
2007/05/30 16:41:01 aw 1.47.86.3: RESYNC: (1.48-1.50); FILE MERGED
2007/04/23 14:38:04 aw 1.47.86.2: RESYNC: (1.47-1.48); FILE MERGED
2007/04/05 14:19:32 aw 1.47.86.1: #i74769# Scroll needs to move the child windows which are FormControls
Diffstat (limited to 'sd/source/ui/view/viewshe2.cxx')
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 681b3c9a9025..db37a8dd42fd 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewshe2.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: obo $ $Date: 2007-06-11 14:54:26 $ + * last change: $Author: hr $ $Date: 2007-06-26 11:47:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -459,7 +459,12 @@ void ViewShell::SetZoom(long nZoom) if (mpContentWindow.get() != NULL) { mpContentWindow->SetZoomIntegral(nZoom); - mpContentWindow->Invalidate(); + + // #i74769# Here is a 2nd way (besides Window::Scroll) to set the visible prt + // of the window. It needs - like Scroll(SCROLL_CHILDREN) does - also to move + // the child windows. I am trying INVALIDATE_CHILDREN here which makes things better, + // but does not solve the problem completely. Neet to ask PL. + mpContentWindow->Invalidate(INVALIDATE_CHILDREN); } Size aVisSizePixel = GetActiveWindow()->GetOutputSizePixel(); @@ -504,7 +509,9 @@ void ViewShell::SetZoomRect(const Rectangle& rZoomRect) mpContentWindow->SetZoomIntegral(nZoom); mpContentWindow->SetWinViewPos(aNewPos); mpContentWindow->UpdateMapOrigin(); - mpContentWindow->Invalidate(); + + // #i74769# see above + mpContentWindow->Invalidate(INVALIDATE_CHILDREN); } Size aVisSizePixel = GetActiveWindow()->GetOutputSizePixel(); |