[Libreoffice-commits] .: 2 commits - scripting/source sc/source sw/source vbahelper/source

[Libreoffice Gerrit user]

 sc/source/ui/vba/vbaapplication.cxx      |    3 +--
 sc/source/ui/vba/vbahelper.cxx           |    4 +---
 scripting/source/basprov/basscript.cxx   |    4 +---
 sw/source/ui/vba/vbaapplication.cxx      |    2 +-
 vbahelper/source/vbahelper/vbahelper.cxx |    5 +----
 5 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 0990da105f89004f6071cf8cfee271e8b5f2d2c8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 4 19:36:15 2012 +0100

    clean up more sbxToUnoValue declarations
    
    Change-Id: Ieff54baaff53031712f737dab84f840adb3bb09a

diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index a3dbb0e..f8ae29e 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 cc92f95..98624b0 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 2a091ba..a9f9f8d 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 f0f2f06..0274b1f 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
 {
commit 7fe270b5718b8791128b9b8faee8b3e7d04f2be7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 4 19:22:52 2012 +0100

    warning C4273: sbxToUnoValue: inconsistent dll linkage
    
    Change-Id: I4677038ea4c702dfcea70a018c119ed31bb2cc60

diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 1ededa0..f15f0ab 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -87,6 +87,7 @@
 #include "excelvbahelper.hxx"
 
 #include <basic/sbmod.hxx>
+#include <basic/sbuno.hxx>
 #include <basic/sbxobj.hxx>
 
 #include "viewutil.hxx"
@@ -105,8 +106,6 @@ using ::rtl::OUString;
 #define FILE_PATH_SEPERATOR "\\"
 #endif
 
-uno::Any sbxToUnoValue( SbxVariable* pVar );
-
 // ============================================================================
 
 /** Global application settings shared by all open workbooks. */