handle various ReturnXXXX types for forms

Change-Id: I6d017da640804d95c605739ca70566b34c4c5e5a

5 files changed, 19 insertions, 12 deletions

diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 75431a77edce..ac34518804b2 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -520,10 +520,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
     fmTransitionEffect \
     fmVerticalScrollBarSide \
     fmZOrder \
-	ReturnBoolean \
-	ReturnEffect \
-	ReturnInteger \
-	ReturnSingle \
 	XButton \
 	XCheckBox \
 	XColorFormat \
@@ -544,6 +540,10 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
 	XPictureFormat \
 	XProgressBar \
 	XRadioButton \
+	XReturnBoolean \
+	XReturnEffect \
+	XReturnInteger \
+	XReturnSingle \
 	XScrollBar \
 	XShape \
 	XShapeRange \
diff --git a/oovbaapi/ooo/vba/msforms/ReturnSingle.idl b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
index 6d2e07b09af6..102cda1bcc1c 100644
--- a/oovbaapi/ooo/vba/msforms/ReturnSingle.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
@@ -16,9 +16,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/uno/XInterface.idl>
+
 module ooo { module vba { module msforms {
-    struct ReturnSingle
+    interface XReturnBoolean
     {
-        float Value;
+        [attribute] boolean Value;
     };
 }; }; };
diff --git a/oovbaapi/ooo/vba/msforms/ReturnEffect.idl b/oovbaapi/ooo/vba/msforms/XReturnEffect.idl
index 817b0cd41943..db656b920bd7 100644
--- a/oovbaapi/ooo/vba/msforms/ReturnEffect.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnEffect.idl
@@ -16,10 +16,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/uno/XInterface.idl>
+
 module ooo { module vba { module msforms {
-    struct ReturnEffect
+    interface XReturnEffect
     {
         //fmDropEffect Value;
-        short Value;
+        [attribute] short Value;
     };
 }; }; };
diff --git a/oovbaapi/ooo/vba/msforms/ReturnInteger.idl b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
index 3b949ad3bfcf..f55a28210b8c 100644
--- a/oovbaapi/ooo/vba/msforms/ReturnInteger.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
@@ -16,9 +16,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/uno/XInterface.idl>
+
 module ooo { module vba { module msforms {
-    struct ReturnInteger
+    interface XReturnInteger
     {
-        long Value;
+        [attribute] long Value;
     };
 }; }; };
diff --git a/oovbaapi/ooo/vba/msforms/ReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/XReturnSingle.idl
index cd739ddf49a9..d92d2eab379c 100644
--- a/oovbaapi/ooo/vba/msforms/ReturnBoolean.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnSingle.idl
@@ -15,10 +15,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+#include <com/sun/star/uno/XInterface.idl>
 
 module ooo { module vba { module msforms {
-    struct ReturnBoolean
+    interface XReturnSingle
     {
-        boolean Value;
+        [attribute] float Value;
     };
 }; }; };