[Libreoffice-commits] online.git: loolwsd/bundled

[Tor Lillqvist]

 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 80d9610432ee0c06ec9899f70860c364446d7ddb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 4 12:09:14 2016 +0200

    Update from LO master

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 901bf6b..80ed9de 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -66,6 +66,15 @@ typedef enum
 }
 LibreOfficeKitOptionalFeatures;
 
+// This enumerates the types of callbacks emitted to a LibreOfficeKit
+// object's callback function or to a LibreOfficeKitDocument object's
+// callback function. No callback type will be emitted to both. It is a
+// bit unfortunate that the same enum contains both kinds of
+// callbacks.
+
+// TODO: We should really add some indication at the documentation for
+// each enum value telling which type of callback it is.
+
 typedef enum
 {
     /**