diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-05-21 16:40:24 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-05-21 16:40:24 +0200 |
| commit | f9561071999b3c5c8505d648c14fff7b1bcd0caa (patch) | |
| tree | f3181eb80b29309b83c3d34469c357d040feb2f4 | |
| parent | 3e212fc8ff1aa83dae46d8e56155d92b1d909ed4 (diff) | |
| parent | f0f55d0c3330f3e217ebc15e4329dda617fb5950 (diff) | |
CWS-TOOLING: integrate CWS gridcontrol_03
Notes
split repo tag: libs-core_ooo/DEV300_m79
| -rw-r--r-- | basic/inc/basic/sbuno.hxx | 2 | ||||
| -rw-r--r-- | basic/source/classes/eventatt.cxx | 6 | ||||
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/step1.cxx | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx index 68e2c6ab8778..d816d424313b 100644 --- a/basic/inc/basic/sbuno.hxx +++ b/basic/inc/basic/sbuno.hxx @@ -41,5 +41,7 @@ void createAllObjectProperties( SbxObject* pObj ); ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar ); +void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue ); + #endif diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index b1170baa2010..791e9fe5a8c1 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -65,6 +65,7 @@ #include <sbunoobj.hxx> #include <basic/sbstar.hxx> #include <basic/sbmeth.hxx> +#include <basic/sbuno.hxx> #include <runtime.hxx> #include <sbintern.hxx> @@ -88,11 +89,6 @@ using namespace ::osl; -//=================================================================== -void unoToSbxValue( SbxVariable* pVar, const Any& aValue ); -Any sbxToUnoValue( SbxVariable* pVar ); - - Reference< frame::XModel > getModelFromBasic( SbxObject* pBasic ) { OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" ); diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 1c95b4f30de6..849fd839bfd1 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -567,7 +567,7 @@ SbxDataType unoToSbxType( const Reference< XIdlClass >& xIdlClass ) } return eRetType; } -void unoToSbxValue( SbxVariable* pVar, const Any& aValue ); + static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, sal_Int32& dimension, sal_Bool bIsZeroIndex, Type* pType = NULL ) { Type aType = aValue.getValueType(); diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx index 2161f3d1dd09..c6f090048bf2 100644 --- a/basic/source/runtime/step1.cxx +++ b/basic/source/runtime/step1.cxx @@ -30,6 +30,7 @@ #include <stdlib.h> #include <rtl/math.hxx> +#include <basic/sbuno.hxx> #include "runtime.hxx" #include "sbintern.hxx" #include "iosys.hxx" @@ -231,8 +232,6 @@ void SbiRuntime::StepRETURN( UINT32 nOp1 ) // FOR-Variable testen (+Endlabel) -void unoToSbxValue( SbxVariable* pVar, const Any& aValue ); - void SbiRuntime::StepTESTFOR( UINT32 nOp1 ) { if( !pForStk ) |