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

Clean up not needed ScTabViewShell LOK methods

Change-Id: Ic834d61cccdd422af96bd1b5933eb1a77e8efc16
üst f6007719
......@@ -181,9 +181,6 @@ private:
OUString maName;
OUString maScope;
LibreOfficeKitCallback mpLibreOfficeKitCallback;
void* mpLibreOfficeKitData;
private:
void Construct( sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE );
......@@ -416,12 +413,6 @@ public:
// #i123629#
bool GetForceFocusOnCurCell() const { return bForceFocusOnCurCell; }
void SetForceFocusOnCurCell(bool bFlag) { bForceFocusOnCurCell=bFlag; }
/// The actual implementation of the vcl::ITiledRenderable::registerCallback() API.
void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData);
/// Invokes the registered callback, if there are any.
void libreOfficeKitCallback(int nType, const char* pPayload) const;
};
#endif
......
......@@ -515,7 +515,7 @@ Size ScModelObj::getDocumentSize()
void ScModelObj::registerCallback(LibreOfficeKitCallback pCallback, void* pData)
{
SolarMutexGuard aGuard;
pDocShell->GetBestViewShell()->registerLibreOfficeKitCallback(pCallback, pData);
pDocShell->GetDocument().GetDrawLayer()->registerLibreOfficeKitCallback(pCallback, pData);
}
void ScModelObj::initializeForTiledRendering()
......
......@@ -994,7 +994,7 @@ void ScGridWindow::LogicInvalidate(const ::vcl::Region* pRegion)
sRectangle = "EMPTY";
else
sRectangle = pRegion->GetBoundRect().toString();
pViewData->GetViewShell()->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, sRectangle.getStr());
pViewData->GetDocument()->GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, sRectangle.getStr());
}
void ScGridWindow::CheckNeedsRepaint()
......
......@@ -1695,9 +1695,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
bForceFocusOnCurCell(false),
nCurRefDlgId(0),
pAccessibilityBroadcaster(NULL),
mbInSwitch(false),
mpLibreOfficeKitCallback(NULL),
mpLibreOfficeKitData(NULL)
mbInSwitch(false)
{
const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
......
......@@ -477,16 +477,4 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
return pResult;
}
void ScTabViewShell::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData)
{
mpLibreOfficeKitCallback = pCallback;
mpLibreOfficeKitData = pData;
}
void ScTabViewShell::libreOfficeKitCallback(int nType, const char* pPayload) const
{
if (mpLibreOfficeKitCallback)
mpLibreOfficeKitCallback(nType, pPayload, mpLibreOfficeKitData);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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