summaryrefslogtreecommitdiff
path: root/automation
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-09-20 11:25:43 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-09-20 11:25:43 +0000
commit64a3056627b80f66576b063b1eff174a005d8a0d (patch)
tree73207236366b689ab973eb22067b862fc8832fbd /automation
parent1e4796a3f31d02a49f7cabdf47aa7e9d69cda75a (diff)
INTEGRATION: CWS gh7 (1.12.2); FILE MERGED
2004/09/15 08:38:18 gh 1.12.2.2: RESYNC: (1.12-1.13); FILE MERGED 2004/09/07 15:37:30 gh 1.12.2.1: #i33935#new command killapp
Diffstat (limited to 'automation')
-rw-r--r--automation/source/testtool/objtest.cxx18
1 files changed, 8 insertions, 10 deletions
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 51d777ba8d0e..4ef341d694f5 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: objtest.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: obo $ $Date: 2004-09-09 17:24:31 $
+ * last change: $Author: rt $ $Date: 2004-09-20 12:25:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -690,6 +690,8 @@ void TestToolObj::InitTestToolObj()
MAKE_TT_KEYWORD( "GetLinkDestination", SbxCLASS_METHOD, SbxSTRING, ID_GetLinkDestination );
MAKE_TT_KEYWORD( "GetRegistryValue", SbxCLASS_METHOD, SbxSTRING, ID_GetRegistryValue );
+ MAKE_TT_KEYWORD( "KillApp", SbxCLASS_METHOD, SbxNULL, ID_KillApp );
+
// Load the Remote Commands from list
if ( !pRCommands ) // Ist static, wird also nur einmal geladen
ReadFlatArray( arR_Cmds, pRCommands );
@@ -1679,13 +1681,9 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
}
}
break;
-// case ID_Kill:
-// if ( !rPar ) // rPar = NULL <=> Kein Parameter
-// {
-// }
-// else
-// SetError( SbxERR_WRONG_ARGS );
-// break;
+ case ID_KillApp:
+ pCommunicationManager->KillApplication();
+ break;
case ID_SaveIDs:
if ( rPar && rPar->Count() >= 2 ) // Genau ein Parameter
{
@@ -2838,7 +2836,7 @@ SbxVariable* TestToolObj::Find( const String& Str, SbxClassType Type)
String TestToolObj::GetRevision( String const &aSourceIn )
{
- // search $Revision: 1.13 $
+ // search $Revision: 1.14 $
xub_StrLen nPos;
if ( ( nPos = aSourceIn.SearchAscii( "$Revision:" ) ) != STRING_NOTFOUND )
return aSourceIn.Copy( nPos+ 10, aSourceIn.SearchAscii( "$", nPos+10 ) -nPos-10);