[Libreoffice-commits] core.git: include/LibreOfficeKit
Tor Lillqvist
tml at collabora.com
Thu Apr 16 02:58:51 PDT 2015
include/LibreOfficeKit/LibreOfficeKit.h | 171 +++++++++++++++++---------------
1 file changed, 91 insertions(+), 80 deletions(-)
New commits:
commit 958d26e11fa20931b8ac543ed4760f50f22c115c
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 16 12:34:43 2015 +0300
The mode lines says we use 4-column indentation steps, so do that then
Also, be consistent in spacing, indentation and alignment. Inconsistency is
infuritating.
In this case, I decided to drop the attempts to align the names of "methods",
and their parameter lists. They were not all aligned anyway, and some of those
that tried to be in fact were off by one column. Also, consistently use a
blank line between the method pointers,
If you feel strongly about this and *want* such inter-line alignment, by all
means re-introduce it, but at least try to be consistent then, and do it for
all methods.
Change-Id: I382ca0eaf8533ebc3f829ebd978a9676ebcefaf0
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h
index f108048..c078318 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -38,14 +38,18 @@ struct _LibreOfficeKit
struct _LibreOfficeKitClass
{
- size_t nSize;
-
- void (*destroy) (LibreOfficeKit* pThis);
- LibreOfficeKitDocument* (*documentLoad) (LibreOfficeKit* pThis, const char* pURL);
- char* (*getError) (LibreOfficeKit* pThis);
- LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis,
- const char* pURL,
- const char* pOptions);
+ size_t nSize;
+
+ void (*destroy) (LibreOfficeKit* pThis);
+
+ LibreOfficeKitDocument* (*documentLoad) (LibreOfficeKit* pThis,
+ const char* pURL);
+
+ char* (*getError) (LibreOfficeKit* pThis);
+
+ LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis,
+ const char* pURL,
+ const char* pOptions);
};
#define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize)
@@ -57,86 +61,93 @@ struct _LibreOfficeKitDocument
struct _LibreOfficeKitDocumentClass
{
- size_t nSize;
+ size_t nSize;
+
+ void (*destroy) (LibreOfficeKitDocument* pThis);
+
+ int (*saveAs) (LibreOfficeKitDocument* pThis,
+ const char* pUrl,
+ const char* pFormat,
+ const char* pFilterOptions);
- void (*destroy) (LibreOfficeKitDocument* pThis);
- int (*saveAs) (LibreOfficeKitDocument* pThis,
- const char* pUrl,
- const char* pFormat,
- const char* pFilterOptions);
#ifdef LOK_USE_UNSTABLE_API
- /// @see lok::Document::getDocumentType().
- int (*getDocumentType) (LibreOfficeKitDocument* pThis);
-
- /// @see lok::Document::getParts().
- int (*getParts) (LibreOfficeKitDocument* pThis);
-
- /// @see lok::Document::getPart().
- int (*getPart) (LibreOfficeKitDocument* pThis);
- /// @see lok::Document::setPart().
- void (*setPart) (LibreOfficeKitDocument* pThis,
- int nPart);
-
- /// @see lok::Document::getPartName().
- char* (*getPartName) (LibreOfficeKitDocument* pThis,
- int nPart);
-
- /** Sets mode of the current part.
- *
- * @param nMode - element from the LibreOfficeKitPartMode enum.
- */
- void (*setPartMode) (LibreOfficeKitDocument* pThis,
- int nMode);
-
- /// @see lok::Document::paintTile().
- void (*paintTile) (LibreOfficeKitDocument* pThis,
- unsigned char* pBuffer,
- const int nCanvasWidth,
- const int nCanvasHeight,
- const int nTilePosX,
- const int nTilePosY,
- const int nTileWidth,
- const int nTileHeight);
-
- /// @see lok::Document::getDocumentSize().
- void (*getDocumentSize) (LibreOfficeKitDocument* pThis,
- long* pWidth,
- long* pHeight);
-
- /// @see lok::Document::initializeForRendering().
- void (*initializeForRendering) (LibreOfficeKitDocument* pThis);
-
- void (*registerCallback) (LibreOfficeKitDocument* pThis,
+ /// @see lok::Document::getDocumentType().
+ int (*getDocumentType) (LibreOfficeKitDocument* pThis);
+
+ /// @see lok::Document::getParts().
+ int (*getParts) (LibreOfficeKitDocument* pThis);
+
+ /// @see lok::Document::getPart().
+ int (*getPart) (LibreOfficeKitDocument* pThis);
+
+ /// @see lok::Document::setPart().
+ void (*setPart) (LibreOfficeKitDocument* pThis,
+ int nPart);
+
+ /// @see lok::Document::getPartName().
+ char* (*getPartName) (LibreOfficeKitDocument* pThis,
+ int nPart);
+
+ /** Sets mode of the current part.
+ *
+ * @param nMode - element from the LibreOfficeKitPartMode enum.
+ */
+ void (*setPartMode) (LibreOfficeKitDocument* pThis,
+ int nMode);
+
+ /// @see lok::Document::paintTile().
+ void (*paintTile) (LibreOfficeKitDocument* pThis,
+ unsigned char* pBuffer,
+ const int nCanvasWidth,
+ const int nCanvasHeight,
+ const int nTilePosX,
+ const int nTilePosY,
+ const int nTileWidth,
+ const int nTileHeight);
+
+ /// @see lok::Document::getDocumentSize().
+ void (*getDocumentSize) (LibreOfficeKitDocument* pThis,
+ long* pWidth,
+ long* pHeight);
+
+ /// @see lok::Document::initializeForRendering().
+ void (*initializeForRendering) (LibreOfficeKitDocument* pThis);
+
+ void (*registerCallback) (LibreOfficeKitDocument* pThis,
LibreOfficeKitCallback pCallback,
void* pData);
- /// @see lok::Document::postKeyEvent
- void (*postKeyEvent)(LibreOfficeKitDocument* pThis,
- int nType,
- int nCharCode,
- int nKeyCode);
- /// @see lok::Document::postMouseEvent
- void (*postMouseEvent)(LibreOfficeKitDocument* pThis,
- int nType,
- int nX,
- int nY,
- int nCount);
- /// @see lok::Document::postUnoCommand
- void (*postUnoCommand)(LibreOfficeKitDocument* pThis,
- const char* pCommand);
-
- /// @see lok::Document::setTextSelection
- void (*setTextSelection)(LibreOfficeKitDocument* pThis,
- int nType,
- int nX,
- int nY);
- /// @see lok::Document::setGraphicSelection
- void (*setGraphicSelection)(LibreOfficeKitDocument* pThis,
+ /// @see lok::Document::postKeyEvent
+ void (*postKeyEvent) (LibreOfficeKitDocument* pThis,
+ int nType,
+ int nCharCode,
+ int nKeyCode);
+
+ /// @see lok::Document::postMouseEvent
+ void (*postMouseEvent) (LibreOfficeKitDocument* pThis,
+ int nType,
+ int nX,
+ int nY,
+ int nCount);
+
+ /// @see lok::Document::postUnoCommand
+ void (*postUnoCommand) (LibreOfficeKitDocument* pThis,
+ const char* pCommand);
+
+ /// @see lok::Document::setTextSelection
+ void (*setTextSelection) (LibreOfficeKitDocument* pThis,
int nType,
int nX,
int nY);
- /// @see lok::Document::resetSelection
- void (*resetSelection)(LibreOfficeKitDocument* pThis);
+
+ /// @see lok::Document::setGraphicSelection
+ void (*setGraphicSelection) (LibreOfficeKitDocument* pThis,
+ int nType,
+ int nX,
+ int nY);
+
+ /// @see lok::Document::resetSelection
+ void (*resetSelection) (LibreOfficeKitDocument* pThis);
#endif // LOK_USE_UNSTABLE_API
};
More information about the Libreoffice-commits
mailing list