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

fix inconsistency with direct calling of buttons on a toolbox

Browse source
This commit is contained in:
Gregor Hartmann<gh 2010-06-04 15:45:26 +02:00
parent e7638a7e64
commit 7c367ef0a8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
automation/source/server/statemnt.cxx
View file

@ -5311,13 +5311,13 @@ BOOL StatementControl::Execute()
{ // Wir fälschen einen Parameter { // Wir fälschen einen Parameter
if ( aUId.HasNumeric() ) if ( aUId.HasNumeric() )
{ {
nParams = PARAM_ULONG_1; nParams |= PARAM_ULONG_1;
nLNr1 = USHORT( aUId.GetNum() ); nLNr1 = USHORT( aUId.GetNum() );
DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" ); DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" );
} }
else else
{ {
nParams = PARAM_STR_1; nParams |= PARAM_STR_1;
aString1 = aUId.GetStr(); aString1 = aUId.GetStr();
} }
} }
@ -5330,9 +5330,9 @@ BOOL StatementControl::Execute()
BOOL bItemFound = FALSE;\ BOOL bItemFound = FALSE;\
{\ {\
SmartId aButtonId;\ SmartId aButtonId;\
if( nParams == PARAM_STR_1 )\ if( nParams & PARAM_STR_1 )\
aButtonId = SmartId( aString1 );\ aButtonId = SmartId( aString1 );\
if( nParams == PARAM_ULONG_1 )\ if( nParams & PARAM_ULONG_1 )\
aButtonId = SmartId( nLNr1 );\ aButtonId = SmartId( nLNr1 );\
for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\ for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\
!aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\ !aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\