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

[pranavk]

 sd/source/ui/inc/ViewShell.hxx   |    2 --
 sd/source/ui/unoidl/unomodel.cxx |   14 ++------------
 sd/source/ui/view/viewshe2.cxx   |   12 ------------
 3 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit 32239a1a1a7432dd9805658afe30997a0813ad10
Author: pranavk <pranavk at collabora.co.uk>
Date:   Fri Mar 16 08:38:55 2018 +0100

    Revert "sd lok: Set the view size to full page size and hide ruler, scrollbars"
    
    Pushed by mistake. Let's revert until tests passes
    
    This reverts commit 1354bafdc707b87f8db1e89c96382c4f4f460554.
    
    Change-Id: I4a8973f4e22332115143319a264fefa68e343dcc
    Reviewed-on: https://gerrit.libreoffice.org/51386
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index a3d82ba4f0c6..c3219dd4db52 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -197,8 +197,6 @@ public:
 
     bool HasRuler() { return mbHasRulers;}
     void SetRuler(bool bRuler);
-    // Hides horizontal, vertical scrollbar as well as scrollbox
-    void SetScrollBarsVisible(bool bVisible);
 
     /** Set internal values of all scroll bars that determine thumb size and
         position.  The external values like size and position of the scroll
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index afe7ede9bde5..8c8569a1a009 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2446,21 +2446,11 @@ void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs
         SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType());
         pOptions->SetShowComments(comphelper::LibreOfficeKit::isTiledAnnotations());
 
-        pViewShell->SetRuler(false);
-        pViewShell->SetScrollBarsVisible(false);
-
+        // Disable map mode, so that it's possible to send mouse event coordinates
+        // in logic units.
         if (sd::Window* pWindow = pViewShell->GetActiveWindow())
         {
-            // get the full page size in pixels
-            pWindow->EnableMapMode();
-            Size aSize(pWindow->LogicToPixel(pDrawView->GetSdrPageView()->GetPage()->GetSize()));
-            // Disable map mode, so that it's possible to send mouse event
-            // coordinates in logic units
             pWindow->EnableMapMode(false);
-
-            // arrange UI elements again with new view size
-            pViewShell->GetParentWindow()->SetSizePixel(aSize);
-            pViewShell->Resize();
         }
 
         // Forces all images to be swapped in synchronously, this
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index aaf69b6775f5..6a2d2eec54e2 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -939,18 +939,6 @@ void ViewShell::SetRuler(bool bRuler)
         GetViewShell()->InvalidateBorder();
 }
 
-void ViewShell::SetScrollBarsVisible(bool bVisible)
-{
-    if (mpVerticalScrollBar.get() != nullptr)
-        mpVerticalScrollBar->Show( bVisible );
-
-    if (mpHorizontalScrollBar.get() != nullptr)
-        mpHorizontalScrollBar->Show( bVisible );
-
-    if (mpScrollBarBox.get() != nullptr)
-        mpScrollBarBox->Show(bVisible);
-}
-
 sal_Int8 ViewShell::AcceptDrop (
     const AcceptDropEvent& rEvt,
     DropTargetHelper& rTargetHelper,