[Libreoffice-commits] core.git: sd/source

[Mert Tumer (via logerrit)]

 sd/source/ui/view/drviews5.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 15d3b2521e3df1ea0bbbba659f82aeb67a2fc1f0
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Tue Apr 7 15:36:34 2020 +0300
Commit:     Mert Tumer <mert.tumer at collabora.com>
CommitDate: Thu Jul 16 21:54:12 2020 +0200

    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 at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98246
    Tested-by: Jenkins
    Reviewed-by: Mert Tumer <mert.tumer at collabora.com>

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 )