diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-10-21 16:15:45 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-21 16:18:45 +0100 |
commit | d1e9aa23a7b74e153479e0e23aac1c02cca48177 (patch) | |
tree | a4f614fbc02935231b28ac98f7fce3baadea2e55 /sd | |
parent | 7d9f02ccdbbe7ba0fe110e3f7d4ae4867711800b (diff) |
Resolves: fdo#83588 Revert "center slide after changing zoom"
This reverts commit b179235f702e474b115ca479b603052f422346fd.
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 27 | ||||
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 1 |
3 files changed, 0 insertions, 29 deletions
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 8c53ccb5321b..34f988d2328e 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -205,7 +205,6 @@ public: virtual void UpdateScrollBars (void); void Scroll(long nX, long nY); void ScrollLines(long nX, long nY); - void ScrollCenter(); virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); void InitWindows(const Point& rViewOrigin, const Size& rViewSize, diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 7408267060ca..b540af7ce31b 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -365,33 +365,6 @@ void ViewShell::SetZoom(long nZoom) UpdateScrollBars(); } -namespace -{ - void CenterScrollBar(ScrollBar *pBar) - { - long nVisSize = pBar->GetVisibleSize(); - long nMin = pBar->GetRangeMin(); - long nMax = pBar->GetRangeMax(); - long nLen = nMax - nMin - nVisSize; - long nPos = nMin + nLen/2; - pBar->DoScroll(nPos); - } -} - -void ViewShell::ScrollCenter() -{ - if (mpHorizontalScrollBar.get() != NULL) - CenterScrollBar(mpHorizontalScrollBar.get()); - - //zoom mode with no panning of the current slide, i.e. the - //scrollbar is in change slide mode not pan slide mode - if (IsPageFlipMode()) - return; - - if (mpVerticalScrollBar.get() != NULL) - CenterScrollBar(mpVerticalScrollBar.get()); -} - /** * Set zoom rectangle for active window. Sets all split windows to the same zoom * factor. diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 343e4c4213dd..52bff55c0f5a 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -655,7 +655,6 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi nNewZoom = std::min( (long) pWin->GetMaxZoom(), basegfx::zoomtools::zoomIn( nOldZoom )); SetZoom( nNewZoom ); - ScrollCenter(); //center slide after changing zoom Invalidate( SID_ATTR_ZOOM ); Invalidate( SID_ATTR_ZOOMSLIDER ); |