diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-07-06 11:06:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-07-06 11:06:01 +0000 |
| commit | 843226f0c3a888a6a3d7c8091c82f8bd287003e3 (patch) | |
| tree | 1d02cf1aa3e0dbc19bfc126de490ee8493787ccb /automation | |
| parent | 2b29ecb99f25f2376fa3ccb4887ecf606f3262a0 (diff) | |
INTEGRATION: CWS docking1 (1.4.26); FILE MERGED
2004/06/15 15:01:38 gh 1.4.26.1: #i29531#add support for string ids to acces UI elements. Needed for new ToolBoxes
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/server/server.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 666dbe35d220..a7578b54de2c 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -2,9 +2,9 @@ * * $RCSfile: server.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-06-17 11:39:29 $ + * last change: $Author: obo $ $Date: 2004-07-06 12:06:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -748,7 +748,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, pApp ) pDlg->SetText( String ( TTProperties::GetSvtResId( TT_GPF ) ) ); pDlg->Show(); DBG_ERROR("GPF"); - pC->ReportError( 0, GEN_RES_STR0( S_GPF_ABORT ) ); + pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) ); StatementList::bDying = TRUE; while ( StatementList::pFirst ) // Kommandos werden übersprungen StatementList::NormalReschedule(); @@ -841,8 +841,9 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) break; } case SIControl: + case SIStringControl: { - new StatementControl( pCmdStream ); // Wird im Konstruktor an Liste angehängt + new StatementControl( pCmdStream, nId ); // Wird im Konstruktor an Liste angehängt break; } case SISlot: @@ -963,7 +964,7 @@ ImplRemoteControl::~ImplRemoteControl() if ( StatementList::pFirst ) { // Es sind noch Kommandos da, also auch eine Möglichkeit zurückzusenden. - StatementList::pFirst->ReportError( 0, GEN_RES_STR0( S_APP_SHUTDOWN ) ); + StatementList::pFirst->ReportError( GEN_RES_STR0( S_APP_SHUTDOWN ) ); while ( StatementList::pFirst ) // Kommandos werden übersprungen StatementList::NormalReschedule(); // Fehler zurückgeschickt } |