the ifaces should be in namespace ooo::vba

oovbaapi/UnoApi_oovbaapi.mk

@@ -172,6 +172,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,\
 	oovbaapi/ooo/vba/msforms/XPictureFormat \
 	oovbaapi/ooo/vba/msforms/XProgressBar \
 	oovbaapi/ooo/vba/msforms/XRadioButton \
+	oovbaapi/ooo/vba/msforms/XReturnBoolean \
+	oovbaapi/ooo/vba/msforms/XReturnInteger \
 	oovbaapi/ooo/vba/msforms/XScrollBar \
 	oovbaapi/ooo/vba/msforms/XShape \
 	oovbaapi/ooo/vba/msforms/XShapeRange \

oovbaapi/ooo/vba/msforms/XReturnBoolean.idl

@@ -32,6 +32,10 @@
 #include <com/sun/star/script/XDefaultProperty.idl>
 //=============================================================================
 
+module ooo
+{
+module vba
+{
 module msforms
 {
 
@@ -42,6 +46,8 @@ interface XReturnBoolean: com::sun::star::script::XDefaultProperty
 };
 //=============================================================================
 
+};
+};
 };
 
 #endif

oovbaapi/ooo/vba/msforms/XReturnInteger.idl

@@ -32,6 +32,10 @@
 #include <com/sun/star/script/XDefaultProperty.idl>
 //=============================================================================
 
+module ooo
+{
+module vba
+{
 module msforms
 {
 
@@ -42,6 +46,8 @@ interface XReturnInteger: com::sun::star::script::XDefaultProperty
 };
 //=============================================================================
 
+};
+};
 };
 
 #endif

scripting/source/vbaevents/vbamsformreturntypes.hxx

@@ -31,11 +31,11 @@
 #define VBA_MSFORM_RETURNTYPES_HXX
 
 #include <cppuhelper/implbase1.hxx>
-#include <msforms/XReturnBoolean.hpp>
-#include <msforms/XReturnInteger.hpp>
+#include <ooo/vba/msforms/XReturnBoolean.hpp>
+#include <ooo/vba/msforms/XReturnInteger.hpp>
 
 
-typedef ::cppu::WeakImplHelper1<msforms::XReturnBoolean> ReturnBoolean_BASE;
+typedef ::cppu::WeakImplHelper1<ooo::vba::msforms::XReturnBoolean> ReturnBoolean_BASE;
 
 class SAL_DLLPUBLIC_EXPORT VbaReturnBoolean : public ReturnBoolean_BASE
 {
@@ -54,7 +54,7 @@ public:
 };
 
 
-typedef ::cppu::WeakImplHelper1<msforms::XReturnInteger> ReturnInteger_BASE;
+typedef ::cppu::WeakImplHelper1<ooo::vba::msforms::XReturnInteger> ReturnInteger_BASE;
 
 class SAL_DLLPUBLIC_EXPORT VbaReturnInteger : public ReturnInteger_BASE
 {