summaryrefslogtreecommitdiff
path: root/include/LibreOfficeKit
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-09-16 14:14:04 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-09-21 07:30:21 +0200
commita04b31c9facb08a8e38b79480b9a73bd2693cb9e (patch)
treead4b216e799831834a12da24b642e6b2d39d491e /include/LibreOfficeKit
parentf2e55ea10676d14c6564696a0648c0edbe4bd36d (diff)
LOK: make getViews() be a member function of Document
Just to be consistent, as all other view-related member functions are there, too. No real impact, as only the unit test uses this so far, and it always works with a single document. Change-Id: I46f1ed8265ab95017986ab45c1b510e961192241
Diffstat (limited to 'include/LibreOfficeKit')
-rw-r--r--include/LibreOfficeKit/LibreOfficeKit.h5
-rw-r--r--include/LibreOfficeKit/LibreOfficeKit.hxx18
2 files changed, 10 insertions, 13 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h
index 18f4b3edc624..fc025aed5b15 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -54,9 +54,6 @@ struct _LibreOfficeKitClass
void (*registerCallback) (LibreOfficeKit* pThis,
LibreOfficeKitCallback pCallback,
void* pData);
-
- /// @see lok::Office::getViews().
- int (*getViews) (LibreOfficeKit* pThis);
#endif
};
@@ -174,6 +171,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);
#endif // LOK_USE_UNSTABLE_API
};
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f5821b71191a..45ace9dfff04 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -294,6 +294,14 @@ public:
{
return mpDoc->pClass->getView(mpDoc);
}
+
+ /**
+ * Get number of views of this document.
+ */
+ inline int getViews()
+ {
+ return mpDoc->pClass->getViews(mpDoc);
+ }
#endif // LOK_USE_UNSTABLE_API
};
@@ -340,16 +348,6 @@ public:
{
return mpThis->pClass->getError(mpThis);
}
-
-#ifdef LOK_USE_UNSTABLE_API
- /**
- * Get number of total views.
- */
- inline int getViews()
- {
- return mpThis->pClass->getViews(mpThis);
- }
-#endif
};
/// Factory method to create a lok::Office instance.