summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMert Tumer <mert.tumer@collabora.com>2020-04-07 15:36:34 +0300
committerAndras Timar <andras.timar@collabora.com>2020-04-07 19:27:49 +0200
commit3bd5dcc02b84da14286af4492f28bc776d765146 (patch)
tree60a0b687729251c17bc15a959fa32f2bf8eebe75
parentbbcf587faa73d8ec7242f287421337b247b51cc5 (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>
-rw-r--r--sd/source/ui/view/drviews5.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 2266c7981d06..dea2c58d795f 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -61,6 +61,7 @@
#include <FormShellManager.hxx>
#include <DrawController.hxx>
#include <memory>
+#include <comphelper/lok.hxx>
namespace sd {
@@ -343,6 +344,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 )