diff options
| author | Gregor Hartmann <gh <Gregor Hartmann<gh@openoffice.org> | 2010-06-04 15:45:26 +0200 |
|---|---|---|
| committer | Gregor Hartmann <gh <Gregor Hartmann<gh@openoffice.org> | 2010-06-04 15:45:26 +0200 |
| commit | 7c367ef0a8380cb55104f6a7d76fa7709ae07dd7 (patch) | |
| tree | 1fd8ed133f64bd35b6fc60551b57687f7242b45c /automation/source | |
| parent | e7638a7e6461f971cfde4b99fd9e246537a2f222 (diff) | |
fix inconsistency with direct calling of buttons on a toolbox
Diffstat (limited to 'automation/source')
| -rw-r--r-- | automation/source/server/statemnt.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 6a04c85c66de..87f479d67512 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -5311,13 +5311,13 @@ BOOL StatementControl::Execute() { // Wir flschen einen Parameter if ( aUId.HasNumeric() ) { - nParams = PARAM_ULONG_1; + nParams |= PARAM_ULONG_1; nLNr1 = USHORT( aUId.GetNum() ); DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" ); } else { - nParams = PARAM_STR_1; + nParams |= PARAM_STR_1; aString1 = aUId.GetStr(); } } @@ -5330,9 +5330,9 @@ BOOL StatementControl::Execute() BOOL bItemFound = FALSE;\ {\ SmartId aButtonId;\ - if( nParams == PARAM_STR_1 )\ + if( nParams & PARAM_STR_1 )\ aButtonId = SmartId( aString1 );\ - if( nParams == PARAM_ULONG_1 )\ + if( nParams & PARAM_ULONG_1 )\ aButtonId = SmartId( nLNr1 );\ for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\ !aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\ |