diff options
| author | Mert Tumer <mert.tumer@collabora.com> | 2020-04-07 15:36:34 +0300 |
|---|---|---|
| committer | Mert Tumer <mert.tumer@collabora.com> | 2020-07-16 21:54:12 +0200 |
| commit | 15d3b2521e3df1ea0bbbba659f82aeb67a2fc1f0 (patch) | |
| tree | cf4bab27bcaaeee0980fbfcdf797c6cd8717ddd0 | |
| parent | 3c446a4ded14ded98d88294ecf5f659718aee6ad (diff) | |
fix ODP roundtripped in online opens with huge zoom in desktop
Change-Id: Ia3192cfeaab8ac643bba7b499240882f403b6388
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91822
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98246
Tested-by: Jenkins
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
| -rw-r--r-- | sd/source/ui/view/drviews5.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 110e7756225f..d632d24a46d0 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -49,11 +49,13 @@ #include <Client.hxx> #include <slideshow.hxx> #include <unokywds.hxx> +#include <sdpage.hxx> #include <SdUnoDrawView.hxx> #include <ViewShellBase.hxx> #include <FormShellManager.hxx> #include <DrawController.hxx> #include <memory> +#include <comphelper/lok.hxx> namespace sd { @@ -336,6 +338,12 @@ void DrawViewShell::WriteFrameViewData() Size aVisSizePixel = GetActiveWindow()->GetOutputSizePixel(); ::tools::Rectangle aVisArea = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0), aVisSizePixel) ); + if (comphelper::LibreOfficeKit::isActive()) + { + // aVisArea is nonsensical in the LOK case, use the slide size + aVisArea = ::tools::Rectangle(Point(), getCurrentPage()->GetSize()); + } + mpFrameView->SetVisArea(aVisArea); if( mePageKind == PageKind::Handout ) |