Kaydet (Commit) d1e9aa23 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#83588 Revert "center slide after changing zoom"

This reverts commit b179235f.
üst 7d9f02cc
......@@ -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,
......
......@@ -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.
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment