diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-03-13 17:47:12 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-03-14 13:24:08 +0000 |
| commit | d3003be764b02c5d2fdfe8bf1046aeded8a40fe9 (patch) | |
| tree | 030efa186b94d00ba1d1f134cfd6f7dd78a9b68a /sd | |
| parent | 3c9b1306384cc88d7afbfe3127ea40ba056a4822 (diff) | |
uitest: add the impress zoom level to the state information
Change-Id: I8c064788159b3cdd83f9ef0f4609e615db789cc3
Reviewed-on: https://gerrit.libreoffice.org/35147
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/uitest/uiobject.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 10 |
3 files changed, 12 insertions, 0 deletions
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 68df8b54640d..3d4dc90cfe67 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 f47e1311b3d7..a604f640014b 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 82b529e869d3..ae3a19a6db17 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. |