[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - include/LibreOfficeKit

[Miklos Vajna]

 include/LibreOfficeKit/LibreOfficeKit.hxx    |    4 ++--
 include/LibreOfficeKit/LibreOfficeKitEnums.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 822a962c9fb5f9d8ad2745e18636ee68c0bee0ef
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Nov 24 16:32:03 2015 +0100

    LOK: update headers from master
    
    Change-Id: I32f0de20864cae267ebd32516f20baf8e38f910b

diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f907f70..a0a420d 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -241,7 +241,7 @@ public:
      * @param pCommand uno command to be posted to the document, like ".uno:Bold"
      * @param pArguments arguments of the uno command.
      */
-    inline void postUnoCommand(const char* pCommand, const char* pArguments = 0, bool bNotifyWhenFinished = false)
+    inline void postUnoCommand(const char* pCommand, const char* pArguments = NULL, bool bNotifyWhenFinished = false)
     {
         mpDoc->pClass->postUnoCommand(mpDoc, pCommand, pArguments, bNotifyWhenFinished);
     }
@@ -264,7 +264,7 @@ public:
      * @param pMimeType suggests the return format, for example text/plain;charset=utf-8.
      * @param pUsedMimeType output parameter to inform about the determined format (suggested one or plain text).
      */
-    inline char* getTextSelection(const char* pMimeType, char** pUsedMimeType = 0)
+    inline char* getTextSelection(const char* pMimeType, char** pUsedMimeType = NULL)
     {
         return mpDoc->pClass->getTextSelection(mpDoc, pMimeType, pUsedMimeType);
     }
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index b713f0e..a0f5e88 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -36,7 +36,7 @@ LibreOfficeKitPartMode;
 typedef enum
 {
     LOK_TILEMODE_RGBA,
-    LOK_TILEMODE_ARGB
+    LOK_TILEMODE_BGRA
 }
 LibreOfficeKitTileMode;