summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-12-04 19:36:15 +0100
committerMichael Stahl <mstahl@redhat.com>2012-12-04 19:56:52 +0100
commit0990da105f89004f6071cf8cfee271e8b5f2d2c8 (patch)
treebd9b632505982623078e23df22d58e685b646e55
parent7fe270b5718b8791128b9b8faee8b3e7d04f2be7 (diff)
clean up more sbxToUnoValue declarations
Change-Id: Ieff54baaff53031712f737dab84f840adb3bb09a
-rw-r--r--sc/source/ui/vba/vbahelper.cxx4
-rw-r--r--scripting/source/basprov/basscript.cxx4
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx5
4 files changed, 4 insertions, 11 deletions
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index a3dbb0e13ffc..f8ae29e0ad91 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -41,6 +41,7 @@
#include <basic/sbx.hxx>
#include <basic/sbstar.hxx>
+#include <basic/sbuno.hxx>
#include <rtl/math.hxx>
#include <math.h>
@@ -55,9 +56,6 @@ using namespace ::com::sun::star;
using namespace ::ooo::vba;
#define POINTTO100THMILLIMETERFACTOR 35.27778
-void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
-
-uno::Any sbxToUnoValue( SbxVariable* pVar );
namespace ooo
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index cc92f958e07a..98624b06593a 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -24,6 +24,7 @@
#include <basic/sbstar.hxx>
#include <basic/sbmod.hxx>
#include <basic/sbmeth.hxx>
+#include <basic/sbuno.hxx>
#include <basic/basmgr.hxx>
#include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp>
#include "bcholder.hxx"
@@ -40,9 +41,6 @@ using namespace ::com::sun::star::script;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::beans;
-extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
-extern void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue );
-
//.........................................................................
namespace basprov
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 2a091ba39424..a9f9f8df7cfa 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -29,6 +29,7 @@
#include "vbaaddins.hxx"
#include "vbadialogs.hxx"
#include <ooo/vba/word/WdEnableCancelKey.hpp>
+#include <basic/sbuno.hxx>
#include <editeng/acorrcfg.hxx>
#include "wordvbahelper.hxx"
#include <docsh.hxx>
@@ -52,7 +53,6 @@ using ::rtl::OUString;
#define EXCELVERSION "11.0"
-uno::Any sbxToUnoValue( SbxVariable* pVar );
SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext )
{
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index f0f2f0641dc8..0274b1f4c647 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -57,6 +57,7 @@
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
#include <basic/sbmeth.hxx>
+#include <basic/sbuno.hxx>
#include <rtl/math.hxx>
#include <sfx2/viewsh.hxx>
#include <math.h>
@@ -76,10 +77,6 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
-
-uno::Any sbxToUnoValue( SbxVariable* pVar );
-
namespace ooo
{