summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-06-01 18:00:41 +0200
committerDavid Tardon <dtardon@redhat.com>2011-06-17 16:41:34 +0200
commite5a758f0d8590145cfe5878eabef28b0bc75942a (patch)
tree545a1779f96c7ec075a9831e6424918d60f0904c
parent93ae25ae902848a0ce0f8def9a79a2ce705682fd (diff)
the ifaces should be in namespace ooo::vba
-rw-r--r--oovbaapi/UnoApi_oovbaapi.mk2
-rw-r--r--oovbaapi/ooo/vba/msforms/XReturnBoolean.idl6
-rw-r--r--oovbaapi/ooo/vba/msforms/XReturnInteger.idl6
-rw-r--r--scripting/source/vbaevents/vbamsformreturntypes.hxx8
4 files changed, 18 insertions, 4 deletions
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 196853f780e2..300450663353 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/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 \
diff --git a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
index edca3789f534..c85d7f7df11b 100644
--- a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
@@ -32,6 +32,10 @@
#include <com/sun/star/script/XDefaultProperty.idl>
//=============================================================================
+module ooo
+{
+module vba
+{
module msforms
{
@@ -43,5 +47,7 @@ interface XReturnBoolean: com::sun::star::script::XDefaultProperty
//=============================================================================
};
+};
+};
#endif
diff --git a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
index cd214b71b799..4b5192e27a76 100644
--- a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
@@ -32,6 +32,10 @@
#include <com/sun/star/script/XDefaultProperty.idl>
//=============================================================================
+module ooo
+{
+module vba
+{
module msforms
{
@@ -43,5 +47,7 @@ interface XReturnInteger: com::sun::star::script::XDefaultProperty
//=============================================================================
};
+};
+};
#endif
diff --git a/scripting/source/vbaevents/vbamsformreturntypes.hxx b/scripting/source/vbaevents/vbamsformreturntypes.hxx
index 82e6ddce8ff4..84deaedd5d14 100644
--- a/scripting/source/vbaevents/vbamsformreturntypes.hxx
+++ b/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
{