chart52: merge with DEV300_m100

7 files changed, 10 insertions, 14 deletions

diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index f27b612ce9cb..c4bc6f872834 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -218,7 +218,7 @@ namespace basprov
         if ( aFunctionName == BASPROV_PROPERTY_EDITABLE )
         {
             ::rtl::OUString sDocURL, sLibName, sModName;
-            USHORT nLine1 = 0, nLine2;
+            sal_uInt16 nLine1 = 0, nLine2;
 
             if ( !m_bIsAppScript )
             {
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index fe6ed69fccab..dc9d98acab64 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -100,7 +100,7 @@ namespace basprov
                 sal_Int32 nRealCount = 0;
                 for ( sal_Int32 i = 0; i < nCount; ++i )
                 {
-                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< USHORT >( i ) ) );
+                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< sal_uInt16 >( i ) ) );
                     if ( pMethod && !pMethod->IsHidden() )
                         ++nRealCount;
                 }
@@ -110,7 +110,7 @@ namespace basprov
                 sal_Int32 iTarget = 0;
                 for ( sal_Int32 i = 0; i < nCount; ++i )
                 {
-                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< USHORT >( i ) ) );
+                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< sal_uInt16 >( i ) ) );
                     if ( pMethod && !pMethod->IsHidden() )
                         pChildNodes[iTarget++] = static_cast< browse::XBrowseNode* >( new BasicMethodNodeImpl( m_xContext, m_sScriptingContext, pMethod, m_bIsAppScript ) );
                 }
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index ed6c9d7e6a5b..db697dfb807f 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -396,7 +396,7 @@ namespace basprov
                 StarBASIC* pBasic = pBasicMgr->GetLib( aLibrary );
                 if ( !pBasic )
                 {
-                    USHORT nId = pBasicMgr->GetLibId( aLibrary );
+                    sal_uInt16 nId = pBasicMgr->GetLibId( aLibrary );
                     if ( nId != LIB_NOTFOUND )
                     {
                         pBasicMgr->LoadLib( nId );
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 24bba1e7bff6..3006ba82e554 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -136,7 +136,7 @@ namespace basprov
             if ( pInfo )
             {
                 sal_Int32 nSbxOptional = 0;
-                USHORT n = 1;
+                sal_uInt16 n = 1;
                 for ( const SbxParamInfo* pParamInfo = pInfo->GetParam( n ); pParamInfo; pParamInfo = pInfo->GetParam( ++n ) )
                 {
                     if ( ( pParamInfo->nFlags & SBX_OPTIONAL ) != 0 )
@@ -169,7 +169,7 @@ namespace basprov
                 {
                     SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
                     unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), pParams[i] );
-                    xSbxParams->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+                    xSbxParams->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
 
                     // Enable passing by ref
                     if ( xSbxVar->GetType() != SbxVARIANT )
@@ -205,7 +205,7 @@ namespace basprov
                 if ( pInfo_ )
                 {
                     OutParamMap aOutParamMap;
-                    for ( USHORT n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
+                    for ( sal_uInt16 n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
                     {
                         const SbxParamInfo* pParamInfo = pInfo_->GetParam( n );
                         if ( pParamInfo && ( pParamInfo->eType & SbxBYREF ) != 0 )
diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk
index c3a99aa81aff..51f834132129 100644
--- a/scripting/source/dlgprov/makefile.mk
+++ b/scripting/source/dlgprov/makefile.mk
@@ -59,6 +59,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB) \
         $(COMPHELPERLIB) \
         $(UCBHELPERLIB) \
+        $(VBAHELPERLIB)	\
         $(CPPULIB) \
         $(BASICLIB) \
         $(SALLIB)
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index e9d12be12b5e..b1268ada4998 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -155,7 +155,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
     sal_Bool bSuccess = sal_False;
     Any invokeResult;
-    bool bCaughtException = FALSE;
+    bool bCaughtException = sal_False;
     Any aException;
 
     if ( m_bInitialised )
@@ -251,7 +251,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
             invokeResult <<= reason.concat( aException.getValueTypeName() ).concat( e.Message );
 
-            bCaughtException = TRUE;
+            bCaughtException = sal_True;
         }
     }
     else
diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk
index 287bbe2b052b..aa4c416da96b 100755
--- a/scripting/source/vbaevents/makefile.mk
+++ b/scripting/source/vbaevents/makefile.mk
@@ -33,11 +33,6 @@ PRJ=..$/..
 
 PRJNAME=scripting
 TARGET=vbaevents
-.IF "$(ENABLE_VBA)"!="YES"
-dummy:
-        @echo "not building vbaevents..."
-.ENDIF
-
 VISIBILITY_HIDDEN=TRUE
 NO_BSYMBOLIC=	TRUE
 ENABLE_EXCEPTIONS=TRUE