[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source sw/source

[Miklos Vajna]

 include/svx/svdmodel.hxx          |    4 ----
 sc/source/ui/unoobj/docuno.cxx    |    1 -
 sd/source/ui/unoidl/unomodel.cxx  |    2 --
 svx/source/svdraw/svdmodel.cxx    |    6 ------
 sw/source/uibase/uno/unotxdoc.cxx |    2 --
 5 files changed, 15 deletions(-)

New commits:
commit b7e8306c09d926ad26bbcfd3ea331fff738d0f98
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Feb 8 11:00:21 2016 +0100

    svx: SdrModel::mbTiledRendering is never read
    
    Change-Id: I8571032b5c43a47872cb3364613ffb936624aa2d

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 4288fac..1759527 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -174,8 +174,6 @@ protected:
     SdrOutliner*    pChainingOutliner; // an Outliner for chaining overflowing text
     sal_uIntPtr           nDefTextHgt;    // Default text height in logical units
     VclPtr<OutputDevice>  pRefOutDev;     // ReferenceDevice for the EditEngine
-    /// Set if we are doing tiled rendering.
-    bool mbTiledRendering;
     LibreOfficeKitCallback mpLibreOfficeKitCallback;
     void* mpLibreOfficeKitData;
     /// Set if we are in the middle of a tiled search.
@@ -337,8 +335,6 @@ public:
     // ReferenceDevice for the EditEngine
     void                 SetRefDevice(OutputDevice* pDev);
     OutputDevice*        GetRefDevice() const                   { return pRefOutDev.get(); }
-    /// Set if we are doing tiled rendering.
-    void                 setTiledRendering(bool bTiledRendering);
     /// The actual implementation of the vcl::ITiledRenderable::registerCallback() API.
     void                 registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData);
     /// Gets the LOK callback registered by registerLibreOfficeKitCallback().
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 8806a88..7620b63 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -924,7 +924,6 @@ Pointer ScModelObj::getPointer()
 void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& /*rArguments*/)
 {
     SolarMutexGuard aGuard;
-    pDocShell->GetDocument().GetDrawLayer()->setTiledRendering(true);
 
     // show us the text exactly
     ScInputOptions aInputOptions(SC_MOD()->GetInputOptions());
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index cf0a32c..bca7885 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2368,8 +2368,6 @@ void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs
         // tiled rendering works only when we are in the 'Normal' view, switch to that
         mpDocShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_VIEWSHELL0, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
 
-    mpDoc->setTiledRendering(true);
-
     if (DrawViewShell* pViewShell = GetViewShell())
     {
         DrawView* pDrawView = pViewShell->GetDrawView();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index f17a4ff..d992ab2 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -126,7 +126,6 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     pDrawOutliner=nullptr;
     pHitTestOutliner=nullptr;
     pRefOutDev=nullptr;
-    mbTiledRendering = false;
     mpLibreOfficeKitCallback = nullptr;
     mpLibreOfficeKitData = nullptr;
     mbTiledSearching = false;
@@ -812,11 +811,6 @@ void SdrModel::SetRefDevice(OutputDevice* pDev)
     RefDeviceChanged();
 }
 
-void SdrModel::setTiledRendering(bool bTiledRendering)
-{
-    mbTiledRendering = bTiledRendering;
-}
-
 void SdrModel::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData)
 {
     mpLibreOfficeKitCallback = pCallback;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index a6e4719..aedf88c 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3232,8 +3232,6 @@ void SwXTextDocument::initializeForTiledRendering(const css::uno::Sequence<css::
 {
     SolarMutexGuard aGuard;
 
-    // Call setTiledRendering() first, so that when we change the view layout,
-    // we already don't center the pages.
     SwDoc* pDoc = pDocShell->GetDoc();
     SwViewShell* pViewShell = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();