diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/lokhelper.cxx | 10 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index bfb55c10eff1..beafa3fa437c 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -375,7 +375,7 @@ void SfxLokHelper::notifyOtherView(const SfxViewShell* pThisView, SfxViewShell c const OString aPayload = lcl_generateJSON(pThisView, rKey, rPayload); const int viewId = SfxLokHelper::getView(pThisView); - pOtherView->libreOfficeKitViewCallback(nType, aPayload.getStr(), viewId); + pOtherView->libreOfficeKitViewCallbackWithViewId(nType, aPayload.getStr(), viewId); } void SfxLokHelper::notifyOtherView(const SfxViewShell* pThisView, SfxViewShell const* pOtherView, @@ -386,7 +386,7 @@ void SfxLokHelper::notifyOtherView(const SfxViewShell* pThisView, SfxViewShell c return; const int viewId = SfxLokHelper::getView(pThisView); - pOtherView->libreOfficeKitViewCallback(nType, lcl_generateJSON(pThisView, rTree).getStr(), viewId); + pOtherView->libreOfficeKitViewCallbackWithViewId(nType, lcl_generateJSON(pThisView, rTree).getStr(), viewId); } void SfxLokHelper::notifyOtherViews(const SfxViewShell* pThisView, int nType, std::string_view rKey, @@ -413,7 +413,7 @@ void SfxLokHelper::notifyOtherViews(const SfxViewShell* pThisView, int nType, st viewId = SfxLokHelper::getView(pThisView); } - pViewShell->libreOfficeKitViewCallback(nType, aPayload.getStr(), viewId); + pViewShell->libreOfficeKitViewCallbackWithViewId(nType, aPayload.getStr(), viewId); } pViewShell = SfxViewShell::GetNext(*pViewShell); @@ -444,7 +444,7 @@ void SfxLokHelper::notifyOtherViews(const SfxViewShell* pThisView, int nType, viewId = SfxLokHelper::getView(pThisView); } - pViewShell->libreOfficeKitViewCallback(nType, aPayload.getStr(), viewId); + pViewShell->libreOfficeKitViewCallbackWithViewId(nType, aPayload.getStr(), viewId); } pViewShell = SfxViewShell::GetNext(*pViewShell); @@ -578,7 +578,7 @@ void SfxLokHelper::notifyVisCursorInvalidation(OutlinerViewShell const* pThisVie "\", \"mispelledWord\": \"" + OString::number(bMispelledWord ? 1 : 0) + "\", \"hyperlink\": " + sHyperlink + " }"; const int viewId = SfxLokHelper::getView(); - pThisView->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sPayload.getStr(), viewId); + pThisView->libreOfficeKitViewCallbackWithViewId(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, sPayload.getStr(), viewId); } else { diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 2b78cde00386..2d21ee8b0909 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1498,16 +1498,16 @@ void SfxViewShell::libreOfficeKitViewInvalidateTilesCallback(const tools::Rectan "SfxViewShell::libreOfficeKitViewInvalidateTilesCallback no callback set!"); } -void SfxViewShell::libreOfficeKitViewCallback(int nType, const char* pPayload, int nViewId) const +void SfxViewShell::libreOfficeKitViewCallbackWithViewId(int nType, const char* pPayload, int nViewId) const { if (ignoreLibreOfficeKitViewCallback(nType, pImpl.get())) return; if (pImpl->m_pLibreOfficeKitViewCallback) - pImpl->m_pLibreOfficeKitViewCallback->libreOfficeKitViewCallback(nType, pPayload, nViewId); + pImpl->m_pLibreOfficeKitViewCallback->libreOfficeKitViewCallbackWithViewId(nType, pPayload, nViewId); else SAL_INFO( "sfx.view", - "SfxViewShell::libreOfficeKitViewCallback no callback set! Dropped payload of type " + "SfxViewShell::libreOfficeKitViewCallbackWithViewId no callback set! Dropped payload of type " << lokCallbackTypeToString(nType) << ": [" << pPayload << ']'); } |