Kaydet (Commit) d0cf72f2 authored tarafından Miklos Vajna's avatar Miklos Vajna

sfx2: clean up no longer needed SfxObjectShell::isTiledRendering()

Change-Id: Ia4fb0b489509364c641f8e1e695353bbdb036b59
üst ec8bc265
......@@ -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 \
......
......@@ -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();
......
......@@ -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:
......
......@@ -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;
......
......@@ -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: */
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment