sd/source/ui/inc/ViewShell.hxx | 1 + sd/source/ui/uitest/uiobject.cxx | 1 + sd/source/ui/view/viewshe2.cxx | 10 ++++++++++ 3 files changed, 12 insertions(+)
New commits: commit d3003be764b02c5d2fdfe8bf1046aeded8a40fe9 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Mar 13 17:47:12 2017 +0100 uitest: add the impress zoom level to the state information Change-Id: I8c064788159b3cdd83f9ef0f4609e615db789cc3 Reviewed-on: https://gerrit.libreoffice.org/35147 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 68df8b5..3d4dc90 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -201,6 +201,7 @@ public: void Scroll(long nX, long nY); void ScrollLines(long nX, long nY); virtual void SetZoom(long nZoom); + long GetZoom() const; virtual void SetZoomRect(const Rectangle& rZoomRect); void InitWindows(const Point& rViewOrigin, const Size& rViewSize, const Point& rWinPos, bool bUpdate = false); diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx index f47e131..a604f64 100644 --- a/sd/source/ui/uitest/uiobject.cxx +++ b/sd/source/ui/uitest/uiobject.cxx @@ -90,6 +90,7 @@ StringMap ImpressWindowUIObject::get_state() aMap["SelectedText"] = getViewShell(mxWindow)->GetSelectionText(false); aMap["CurrentSlide"] = OUString::number(getViewShell(mxWindow)->GetCurPageId()); + aMap["Zoom"] = OUString::number(getViewShell(mxWindow)->GetZoom()); return aMap; } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 82b529e..ae3a19a 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -359,6 +359,16 @@ void ViewShell::SetZoom(long nZoom) UpdateScrollBars(); } +long ViewShell::GetZoom() const +{ + if (mpContentWindow) + { + mpContentWindow->GetZoom(); + } + + return 0; +} + /** * Set zoom rectangle for active window. Sets all split windows to the same zoom * factor. _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits