diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2009-08-15 16:26:40 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2009-08-15 16:26:40 +0000 |
| commit | d13e45bbade0a247f0ec8880dc891f4abafe372a (patch) | |
| tree | 658b141342f819f81588916c0c93b43d6a97d66e /automation | |
| parent | e7286139948ddc699c969b946dda5b88738e1d07 (diff) | |
#i92516# move solar.hrc to vcl
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/server/statemnt.cxx | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 1d0eb9d85eaf..318a60a7259a 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -4811,37 +4811,49 @@ BOOL StatementControl::Execute() } break; case M_GetPage: - pRet->GenReturn ( RET_Value, aUId, static_cast<comm_ULONG>(((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit + pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText()); break; case M_SetPage : { // Wegen lokaler Variablen TabControl *pTControl = ((TabControl*)pControl); USHORT nActive = pTControl->GetCurPageId(); USHORT i,anz; - ULONG nID = 0; + SmartId aID; + SmartId aWantedID; + if ( (nParams & PARAM_ULONG_1) ) + { + aWantedID = SmartId( nLNr1 ); + } + else if ( (nParams & PARAM_STR_1) ) + { + aWantedID = SmartId( aString1 ); + } + else + ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); + i = pTControl->GetPagePos( pTControl->GetCurPageId() ); - for ( anz=0 ; anz < pTControl->GetPageCount() && nID != nLNr1 ; anz++ ) + for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ ) { pTControl->SelectTabPage( pTControl->GetPageId(i) ); /*if (pTControl->GetCurPageId()) pTControl->DeactivatePage(); pTControl->SetCurPageId( pTControl->GetPageId(i) ); pTControl->ActivatePage();*/ - nID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId().GetNum(); + aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId(); i++; if ( i >= pTControl->GetPageCount() ) i = 0; if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) ) // 3 Mal aufrufen break; } - if ( nID != nLNr1 ) + if ( !aID.Matches( aWantedID ) ) { pTControl->SelectTabPage( nActive ); /*if (pTControl->GetCurPageId()) pTControl->DeactivatePage(); pTControl->SetCurPageId( nActive ); pTControl->ActivatePage();*/ - ReportError( SmartId( nLNr1 ), GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); + ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); } } break; |