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

Miklos Vajna vmiklos at collabora.co.uk
Thu Dec 17 00:17:04 PST 2015


 sc/source/ui/docshell/docsh.cxx    |    5 -----
 sc/source/ui/inc/docsh.hxx         |    1 -
 sd/source/ui/docshell/docshell.cxx |    9 ---------
 sd/source/ui/inc/DrawDocShell.hxx  |    1 -
 sw/inc/docsh.hxx                   |    1 -
 sw/source/uibase/app/docsh.cxx     |    6 ------
 6 files changed, 23 deletions(-)

New commits:
commit 5b44a9733a79decc2eebfc2360fdd837349b5759
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Dec 17 09:15:44 2015 +0100

    sw, sd, sc: clean up no longer necessary isTiledRendering() member functions
    
    Change-Id: I508a29fd261865771d780b1c241841d9abfeb6ed

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 2baa653..43f8756 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3188,9 +3188,4 @@ void ScDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const
     aDocument.GetDrawLayer()->libreOfficeKitCallback(nType, pPayload);
 }
 
-bool ScDocShell::isTiledRendering() const
-{
-    return aDocument.GetDrawLayer() && aDocument.GetDrawLayer()->isTiledRendering();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index a897c92..bf228f7 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -424,7 +424,6 @@ public:
     void SnapVisArea( Rectangle& rRect ) const;
 
     virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override;
-    bool isTiledRendering() const;
 };
 
 void UpdateAcceptChangesDialog();
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index c30436e..f47b0a7 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -470,15 +470,6 @@ void DrawDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const
         mpDoc->libreOfficeKitCallback(nType, pPayload);
 }
 
-bool DrawDocShell::isTiledRendering() const
-{
-    if (!mpDoc)
-        return false;
-    return mpDoc->isTiledRendering();
-}
-
-
-
 } // end of namespace sd
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 04a6564..b43f84b 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -204,7 +204,6 @@ public:
     void                    ClearUndoBuffer();
 
     virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override;
-    bool isTiledRendering() const;
 
 protected:
 
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index f7e7ec2..84774c17 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -310,7 +310,6 @@ public:
     virtual bool    GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash ) override;
 
     virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override;
-    bool isTiledRendering() const;
 };
 
 /** Find the right DocShell and create a new one:
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 72533e5..48f8b05 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1346,10 +1346,4 @@ void SwDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const
     pDrawModel->libreOfficeKitCallback(nType, pPayload);
 }
 
-bool SwDocShell::isTiledRendering() const
-{
-    SwDrawModel* pDrawModel = m_pDoc->getIDocumentDrawModelAccess().GetDrawModel();
-    return pDrawModel->isTiledRendering();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list