[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source

Mert Tumer (via logerrit) logerrit at kemper.freedesktop.org
Tue Apr 7 17:28:21 UTC 2020


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

New commits:
commit 3bd5dcc02b84da14286af4492f28bc776d765146
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Tue Apr 7 15:36:34 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Apr 7 19:27:49 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>

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 )


More information about the Libreoffice-commits mailing list