diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-16 10:15:31 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-16 12:36:28 +0200 |
commit | dc00592b4e48a111efc6ff78bdbf7af998e58e22 (patch) | |
tree | 8ed83a15626e4f79db23da9d584f478dfe3f604f /include | |
parent | ef7abe81df10cb8a8c04afbb1fbe700f94e73f04 (diff) |
lok::Document: rename getViews() to getViewsCount()
As this only returns the number of views, not the actual views. Since
it's a rename, it's just an API (but not an ABI) change.
Change-Id: Ib4f0ea56a90e5ae9c80ee1781aa2f29aff4259e7
Diffstat (limited to 'include')
-rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 4 | ||||
-rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 12 | ||||
-rw-r--r-- | include/sfx2/lokhelper.hxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 81d65c1ace38..a0ed81947280 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -219,8 +219,8 @@ struct _LibreOfficeKitDocumentClass void (*setView) (LibreOfficeKitDocument* pThis, int nId); /// @see lok::Document::getView(). int (*getView) (LibreOfficeKitDocument* pThis); - /// @see lok::Document::getViews(). - int (*getViews) (LibreOfficeKitDocument* pThis); + /// @see lok::Document::getViewsCount(). + int (*getViewsCount) (LibreOfficeKitDocument* pThis); /// @see lok::Document::renderFont(). unsigned char* (*renderFont) (LibreOfficeKitDocument* pThis, diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index eae43af27178..cd3488505673 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -363,7 +363,7 @@ public: * By default a loaded document has 1 view. * @return the ID of the new view. */ - uintptr_t createView() + int createView() { return mpDoc->pClass->createView(mpDoc); } @@ -372,7 +372,7 @@ public: * Destroy a view of an existing document. * @param nId a view ID, returned by createView(). */ - void destroyView(uintptr_t nId) + void destroyView(int nId) { mpDoc->pClass->destroyView(mpDoc, nId); } @@ -381,7 +381,7 @@ public: * Set an existing view of an existing document as current. * @param nId a view ID, returned by createView(). */ - void setView(uintptr_t nId) + void setView(int nId) { mpDoc->pClass->setView(mpDoc, nId); } @@ -390,7 +390,7 @@ public: * Get the current view. * @return a view ID, previously returned by createView(). */ - uintptr_t getView() + int getView() { return mpDoc->pClass->getView(mpDoc); } @@ -398,9 +398,9 @@ public: /** * Get number of views of this document. */ - inline int getViews() + inline int getViewsCount() { - return mpDoc->pClass->getViews(mpDoc); + return mpDoc->pClass->getViewsCount(mpDoc); } /** diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index 852aa79af058..7460377fd3ba 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -28,7 +28,7 @@ public: /// Get the currently active view. static int getView(SfxViewShell* pViewShell = nullptr); /// Get the number of views of the current object shell. - static std::size_t getViews(); + static std::size_t getViewsCount(); /// Invoke the LOK callback of all views except pThisView, with a payload of rKey-rPayload. static void notifyOtherViews(SfxViewShell* pThisView, int nType, const OString& rKey, const OString& rPayload); |