mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mib17: branch merge

Browse Source
This commit is contained in:
Daniel Rentz
2010-07-07 19:46:28 +02:00
parent c449069c06 cbd90787cc
commit 11b65b14d9
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/source/classes/disas.cxx
View File

@@ -153,6 +153,7 @@ static const char* pOp3[] = {
"DCREATE_REDIMP", // Change dimensions of a user defined Object-Array (+StringId+StringId) "DCREATE_REDIMP", // Change dimensions of a user defined Object-Array (+StringId+StringId)
"FIND_CM", // Search inside a class module (CM) to enable global search in time "FIND_CM", // Search inside a class module (CM) to enable global search in time
"PUBLIC_P", // Module global Variable (persisted between calls)(+StringID+Typ) "PUBLIC_P", // Module global Variable (persisted between calls)(+StringID+Typ)
"FIND_STATIC", // local static var lookup (+StringID+Typ)
}; };
static const char** pOps[3] = { pOp1, pOp2, pOp3 }; static const char** pOps[3] = { pOp1, pOp2, pOp3 };
@@ -220,6 +221,7 @@ static const Func pOperand3[] = {
&SbiDisas::Str2Op, // Redimensionate User defined Object-Array (+StringId+StringId) &SbiDisas::Str2Op, // Redimensionate User defined Object-Array (+StringId+StringId)
&SbiDisas::VarOp, // FIND_CM &SbiDisas::VarOp, // FIND_CM
&SbiDisas::VarDefOp, // PUBLIC_P &SbiDisas::VarDefOp, // PUBLIC_P
&SbiDisas::VarOp, // FIND_STATIC
}; };
// TODO: Why as method? Isn't a simple define sufficient? // TODO: Why as method? Isn't a simple define sufficient?

9
basic/source/comp/exprtree.cxx
View File

@@ -1009,13 +1009,8 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
else else
pExpr = new SbiExpression( pParser ); pExpr = new SbiExpression( pParser );
if( bByVal ) if( bByVal && pExpr->IsLvalue() )
{ pExpr->SetByVal();
if( !pExpr->IsLvalue() )
pParser->Error( SbERR_LVALUE_EXPECTED );
else
pExpr->SetByVal();
}
//pExpr = bConst ? new SbiConstExpression( pParser ) //pExpr = bConst ? new SbiConstExpression( pParser )
// : new SbiExpression( pParser ); // : new SbiExpression( pParser );

2
basic/source/comp/sbcomp.cxx
View File

@@ -67,7 +67,7 @@ void dbg_SaveDisassembly( SbModule* pModule )
( OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY ); ( OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
if( xSFI.is() ) if( xSFI.is() )
{ {
String aFile( RTL_CONSTASCII_USTRINGPARAM("file:///d:/BasicAsm_") ); String aFile( RTL_CONSTASCII_USTRINGPARAM("file:///d:/zBasic.Asm/Asm_") );
StarBASIC* pBasic = (StarBASIC*)pModule->GetParent(); StarBASIC* pBasic = (StarBASIC*)pModule->GetParent();
if( pBasic ) if( pBasic )
{ {

11
vbahelper/source/msforms/vbacontrols.cxx
View File

@@ -349,13 +349,16 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex )
} }
catch( uno::RuntimeException& ) catch( uno::RuntimeException& )
{ {
throw; // the exceptions are not rethrown, impossibility to find or remove the control is currently not reported
// since in most cases it means just that the controls is already not there, the VBA seems to do it in the same way
// throw;
} }
catch( uno::Exception& e ) catch( uno::Exception& e )
{ {
throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not create AXControl!" ) ), // throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not create AXControl!" ) ),
uno::Reference< uno::XInterface >(), // uno::Reference< uno::XInterface >(),
uno::makeAny( e ) ); // uno::makeAny( e ) );
} }
} }