include/sfx2/objsh.hxx | 1 -
sc/source/ui/inc/docsh.hxx | 2 +-
sd/source/ui/inc/DrawDocShell.hxx | 2 +-
sfx2/source/control/unoctitm.cxx | 3 ++-
sfx2/source/doc/objcont.cxx | 6 ------
sw/inc/docsh.hxx | 2 +-
6 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit d0cf72f253a3cb8335601ebf2c5b1b99ab63e6b1
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Dec 16 09:13:58 2015 +0100
sfx2: clean up no longer needed SfxObjectShell::isTiledRendering()
Change-Id: Ia4fb0b489509364c641f8e1e695353bbdb036b59
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 90e2f57..6fd70b2 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -730,7 +730,6 @@ public:
* the default behavior and implements LOK calls.
*/
virtual void libreOfficeKitCallback(int nType, const char* pPayload) const;
- virtual bool isTiledRendering() const;
};
#define SFX_GLOBAL_CLASSID \
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 0c0ba7d..a897c92 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -424,7 +424,7 @@ public:
void SnapVisArea( Rectangle& rRect ) const;
virtual void libreOfficeKitCallback(int nType, const char* pPayload) const
override;
- virtual bool isTiledRendering() const override;
+ bool isTiledRendering() const;
};
void UpdateAcceptChangesDialog();
diff --git a/sd/source/ui/inc/DrawDocShell.hxx
b/sd/source/ui/inc/DrawDocShell.hxx
index 9bc0646..04a6564 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -204,7 +204,7 @@ public:
void ClearUndoBuffer();
virtual void libreOfficeKitCallback(int nType, const char* pPayload) const
override;
- virtual bool isTiledRendering() const override;
+ bool isTiledRendering() const;
protected:
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index efb7026..00c76e2 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -72,6 +72,7 @@
#include <sal/log.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <comphelper/lok.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1056,7 +1057,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const
SfxObjectShell* objSh, const css::frame::FeatureStateEvent& aEvent)
{
- if (!objSh || !objSh->isTiledRendering())
+ if (!comphelper::LibreOfficeKit::isActive())
return;
OUStringBuffer aBuffer;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 135a4d2..30971be 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -663,10 +663,4 @@ void SfxObjectShell::libreOfficeKitCallback(int /*nType*/,
const char* /*pPayloa
SAL_INFO("sfx.tiledrendering", "SfxObjectShell::libreOfficeKitCallback
interface not overridden for SfxObjectShell subclass typeId: " <<
typeid(*this).name());
}
-bool SfxObjectShell::isTiledRendering() const
-{
- SAL_INFO("sfx.tiledrendering", "SfxObjectShell::isTiledRendering interface
not overridden for SfxObjectShell subclass typeId: " << typeid(*this).name());
- return false;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index e3367d1..f7e7ec2 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -310,7 +310,7 @@ public:
virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 >
&rPasswordHash ) override;
virtual void libreOfficeKitCallback(int nType, const char* pPayload) const
override;
- virtual bool isTiledRendering() const override;
+ bool isTiledRendering() const;
};
/** Find the right DocShell and create a new one:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
