strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removetooltypes01: #i112600# remove tooltypes from scripting

Browse source
This commit is contained in:
Mikhail Voytenko 2011-01-14 16:07:01 +01:00
parent 78c5935675
commit 6fb2b3e423
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripting/source/basprov/basmethnode.cxx
View file

@ -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 )
{

4
scripting/source/basprov/basmodnode.cxx
View file

@ -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 ) );
}

2
scripting/source/basprov/basprov.cxx
View file

@ -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 );

6
scripting/source/basprov/basscript.cxx
View file

@ -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 )

4
scripting/source/protocolhandler/scripthandler.cxx
View file

@ -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 )
@ -246,7 +246,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
invokeResult <<= reason.concat( aException.getValueTypeName() ).concat( e.Message );
bCaughtException = TRUE;
bCaughtException = sal_True;
}
#ifdef _DEBUG
catch ( ... )