diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-10-21 12:20:52 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-10-22 15:54:31 +0200 |
| commit | 27df307ce26106c2574b0521346f615a406841bc (patch) | |
| tree | 374f2d0df9abe0784f2ecdbccd6dc63b92138b3b /include | |
| parent | revert unittests to use plain text-based LibreOfficeKitCallback (diff) | |
| download | core-27df307ce26106c2574b0521346f615a406841bc.tar.gz core-27df307ce26106c2574b0521346f615a406841bc.zip | |
better name for a function overload
It's better to add to the name what the overload does rather than
just have a "mysterious" extra int.
Change-Id: Iff89679c4a978a4596ac662ef74e934cdefefc9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124005
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/outliner.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/lokcallback.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/viewsh.hxx | 2 | ||||
| -rw-r--r-- | include/test/lokcallback.hxx | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 72043ce25e2d..1374a9f26f82 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -365,7 +365,7 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI OutlinerViewShell { public: virtual void libreOfficeKitViewCallback(int nType, const char* pPayload) const = 0; - virtual void libreOfficeKitViewCallback(int nType, const char* pPayload, int nViewId) const = 0; + virtual void libreOfficeKitViewCallbackWithViewId(int nType, const char* pPayload, int nViewId) const = 0; virtual void libreOfficeKitViewInvalidateTilesCallback(const tools::Rectangle* pRect, int nPart) const = 0; virtual ViewShellId GetViewShellId() const = 0; virtual ViewShellDocId GetDocId() const = 0; diff --git a/include/sfx2/lokcallback.hxx b/include/sfx2/lokcallback.hxx index 4c40c5452c15..d01e7203205e 100644 --- a/include/sfx2/lokcallback.hxx +++ b/include/sfx2/lokcallback.hxx @@ -30,7 +30,8 @@ public: // LibreOfficeKitCallback equivalent. virtual void libreOfficeKitViewCallback(int nType, const char* pPayload) = 0; // Callback that explicitly provides view id (which is also included in the payload). - virtual void libreOfficeKitViewCallback(int nType, const char* pPayload, int nViewId) = 0; + virtual void libreOfficeKitViewCallbackWithViewId(int nType, const char* pPayload, int nViewId) + = 0; // LOK_CALLBACK_INVALIDATE_TILES // nPart is either part, -1 for all-parts, or INT_MIN if // comphelper::LibreOfficeKit::isPartInInvalidation() is not set diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 84b648d57986..ee11c77a418d 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -338,7 +338,7 @@ public: void setLibreOfficeKitViewCallback(SfxLokCallbackInterface* pCallback); /// Invokes the registered callback, if there are any. virtual void libreOfficeKitViewCallback(int nType, const char* pPayload) const override; - virtual void libreOfficeKitViewCallback(int nType, const char* pPayload, int nViewId) const override; + virtual void libreOfficeKitViewCallbackWithViewId(int nType, const char* pPayload, int nViewId) const override; virtual void libreOfficeKitViewInvalidateTilesCallback(const tools::Rectangle* pRect, int nPart) const override; // Performs any pending calls to libreOfficeKitViewInvalidateTilesCallback() as necessary. virtual void flushPendingLOKInvalidateTiles(); diff --git a/include/test/lokcallback.hxx b/include/test/lokcallback.hxx index 988ce7688e93..f7a619f68cb3 100644 --- a/include/test/lokcallback.hxx +++ b/include/test/lokcallback.hxx @@ -26,7 +26,8 @@ class OOO_DLLPUBLIC_TEST TestLokCallbackWrapper : public SfxLokCallbackInterface public: TestLokCallbackWrapper(LibreOfficeKitCallback callback, void* data); virtual void libreOfficeKitViewCallback(int nType, const char* pPayload) override; - virtual void libreOfficeKitViewCallback(int nType, const char* pPayload, int nViewId) override; + virtual void libreOfficeKitViewCallbackWithViewId(int nType, const char* pPayload, + int nViewId) override; virtual void libreOfficeKitViewInvalidateTilesCallback(const tools::Rectangle* pRect, int nPart) override; |