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

INTEGRATION: CWS sb59 (1.4.10); FILE MERGED

Browse source 
2006/08/16 14:46:07 sb 1.4.10.1: #i67487# Made code warning-free (wntmsci10).
This commit is contained in:
Oliver Bolte 2006-10-12 13:05:59 +00:00
parent f81eb6b3a3
commit 3e56923f32
1 changed files with 23 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
automation/source/testtool/comm_bas.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: comm_bas.cxx,v $ * $RCSfile: comm_bas.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: vg $ $Date: 2006-09-25 13:01:15 $ * last change: $Author: obo $ $Date: 2006-10-12 14:05:59 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -58,19 +58,6 @@
#include <basic/ttstrhlp.hxx> #include <basic/ttstrhlp.hxx>
#endif #endif
//#include "collelem.hxx"
// Makro MEMBER()
// #include <basic/macfix.hxx>
#if defined(MAC) || defined(HPUX)
#define MEMBER(name) &##name
#elif (defined (GCC) && ( __GNUC__ >= 3 )) || (defined(WNT) && (_MSC_VER >= 1400))
#define MEMBER(name) &name
#else
#define MEMBER(name) name
#endif
// Der CommunicationManager hat folgende Elemente: // Der CommunicationManager hat folgende Elemente:
// 1) Properties: // 1) Properties:
// Keine // Keine
@ -125,26 +112,26 @@
CommunicationWrapper::Methods CommunicationWrapper::aManagerMethods[] = { CommunicationWrapper::Methods CommunicationWrapper::aManagerMethods[] = {
// Neue Kommunikation aufbauen // Neue Kommunikation aufbauen
{ "StartCommunication", SbxEMPTY, 2 | _FUNCTION, MEMBER(CommunicationWrapper::MStartCommunication) }, { "StartCommunication", SbxEMPTY, &CommunicationWrapper::MStartCommunication, 2 | _FUNCTION },
// Zwei Named Parameter // Zwei Named Parameter
{ "Host",SbxSTRING, 0,NULL }, { "Host", SbxSTRING, NULL, 0 },
{ "Port",SbxLONG, 0,NULL }, { "Port", SbxLONG, NULL, 0 },
// Alle Kommunikation wird abgebrochen // Alle Kommunikation wird abgebrochen
{ "StopAllCommunication", SbxEMPTY, 0 | _FUNCTION, MEMBER(CommunicationWrapper::MStopAllCommunication) }, { "StopAllCommunication", SbxEMPTY, &CommunicationWrapper::MStopAllCommunication, 0 | _FUNCTION },
// Läuft noch irgendwas // Läuft noch irgendwas
{ "IsCommunicationRunning", SbxBOOL, 0 | _FUNCTION, MEMBER(CommunicationWrapper::MIsCommunicationRunning) }, { "IsCommunicationRunning", SbxBOOL, &CommunicationWrapper::MIsCommunicationRunning, 0 | _FUNCTION },
// Hostname als FQDN erfragen // Hostname als FQDN erfragen
{ "GetMyName", SbxSTRING, 0 | _FUNCTION, MEMBER(CommunicationWrapper::MGetMyName) }, { "GetMyName", SbxSTRING, &CommunicationWrapper::MGetMyName, 0 | _FUNCTION },
// Abfragen ob der Link überhaupt noch gültig ist // Abfragen ob der Link überhaupt noch gültig ist
{ "IsLinkValid", SbxBOOL, 1 | _FUNCTION, MEMBER(CommunicationWrapper::MIsLinkValid) }, { "IsLinkValid", SbxBOOL, &CommunicationWrapper::MIsLinkValid, 1 | _FUNCTION },
// Ein Named Parameter // Ein Named Parameter
{ "Link",SbxOBJECT, 0,NULL }, { "Link", SbxOBJECT, NULL, 0 },
// Dieser Handler wird dauernd gerufen // Dieser Handler wird dauernd gerufen
{ "SetCommunicationEventHandler", SbxEMPTY, 1 | _FUNCTION, MEMBER(CommunicationWrapper::MSetCommunicationEventHandler) }, { "SetCommunicationEventHandler", SbxEMPTY, &CommunicationWrapper::MSetCommunicationEventHandler, 1 | _FUNCTION },
// Ein Named Parameter // Ein Named Parameter
{ "FuncName",SbxSTRING, 0,NULL }, { "FuncName", SbxSTRING, NULL, 0 },
{ NULL, SbxNULL, -1, NULL }}; // Tabellenende { NULL, SbxNULL, NULL, -1 }}; // Tabellenende
@ -153,19 +140,19 @@ CommunicationWrapper::Methods CommunicationWrapper::aManagerMethods[] = {
CommunicationWrapper::Methods CommunicationWrapper::aLinkMethods[] = { CommunicationWrapper::Methods CommunicationWrapper::aLinkMethods[] = {
// Die Kommunikation wird abgebrochen // Die Kommunikation wird abgebrochen
{ "StopCommunication", SbxEMPTY, 0 | _FUNCTION, MEMBER(CommunicationWrapper::LStopCommunication) }, { "StopCommunication", SbxEMPTY, &CommunicationWrapper::LStopCommunication, 0 | _FUNCTION },
// Der eigene Name // Der eigene Name
{ "GetMyName", SbxSTRING, 0 | _FUNCTION, MEMBER(CommunicationWrapper::LGetMyName) }, { "GetMyName", SbxSTRING, &CommunicationWrapper::LGetMyName, 0 | _FUNCTION },
// Der Name des Anderen // Der Name des Anderen
{ "GetHostName", SbxSTRING, 0 | _FUNCTION, MEMBER(CommunicationWrapper::LGetHostName) }, { "GetHostName", SbxSTRING, &CommunicationWrapper::LGetHostName, 0 | _FUNCTION },
// String an den Partner schicken // String an den Partner schicken
{ "Send", SbxEMPTY, 1 | _FUNCTION, MEMBER(CommunicationWrapper::LSend) }, { "Send", SbxEMPTY, &CommunicationWrapper::LSend, 1 | _FUNCTION },
// Ein Named Parameter // Ein Named Parameter
{ "SendString",SbxSTRING, 0,NULL }, { "SendString", SbxSTRING, NULL, 0 },
// Ergebnis des letzten Empfangs // Ergebnis des letzten Empfangs
{ "GetString", SbxSTRING, 0 | _FUNCTION, MEMBER(CommunicationWrapper::LGetString) }, { "GetString", SbxSTRING, &CommunicationWrapper::LGetString, 0 | _FUNCTION },
{ NULL, SbxNULL, -1 ,NULL }}; // Tabellenende { NULL, SbxNULL, NULL, -1 }}; // Tabellenende
@ -448,7 +435,9 @@ void CommunicationWrapper::LGetString( SbxVariable* pVar, SbxArray* /*pPar*/, BO
pReceiveStream->Seek( STREAM_SEEK_TO_BEGIN ); pReceiveStream->Seek( STREAM_SEEK_TO_BEGIN );
char *pBuffer = new char[nLength]; char *pBuffer = new char[nLength];
pReceiveStream->Read( pBuffer, nLength ); pReceiveStream->Read( pBuffer, nLength );
String aReceive( pBuffer, nLength ); String aReceive(
pBuffer, sal::static_int_cast< xub_StrLen >( nLength ),
RTL_TEXTENCODING_UTF8 );
delete [] pBuffer; delete [] pBuffer;
pVar->PutString( aReceive ); pVar->PutString( aReceive );
delete pReceiveStream; delete pReceiveStream;