diff options
Diffstat (limited to 'automation/inc')
-rw-r--r-- | automation/inc/automation/automation.hxx | 2 | ||||
-rw-r--r-- | automation/inc/automation/commdefines.hxx | 50 | ||||
-rw-r--r-- | automation/inc/automation/commtypes.hxx | 10 | ||||
-rw-r--r-- | automation/inc/automation/communi.hxx | 10 | ||||
-rw-r--r-- | automation/inc/automation/simplecm.hxx | 82 | ||||
-rw-r--r-- | automation/inc/pch/precompiled_automation.cxx | 2 | ||||
-rw-r--r-- | automation/inc/pch/precompiled_automation.hxx | 2 |
7 files changed, 79 insertions, 79 deletions
diff --git a/automation/inc/automation/automation.hxx b/automation/inc/automation/automation.hxx index aaf54e24d564..ce997c8ba969 100644 --- a/automation/inc/automation/automation.hxx +++ b/automation/inc/automation/automation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/automation/inc/automation/commdefines.hxx b/automation/inc/automation/commdefines.hxx index 15e38a8ff897..caf6da73dca3 100644 --- a/automation/inc/automation/commdefines.hxx +++ b/automation/inc/automation/commdefines.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,9 +28,9 @@ /************************************************************************* * - * ATTENTION - * This file is intended to work inside and outside the StarOffice environment. - * Only adaption of file commtypes.hxx should be necessary. Else it is a bug! + * ATTENTION + * This file is intended to work inside and outside the StarOffice environment. + * Only adaption of file commtypes.hxx should be necessary. Else it is a bug! * ************************************************************************/ @@ -104,47 +104,47 @@ Defines für Header Typen: Allgemeiner Header: - Byte Länge Inhalt - 0..3 4 Länge des Paketes ohne diese 4 Byte - 4 1 Prüfsumme über die Länge. Stimmt sie nicht wird die Verbindung geschlossen - 5..6 2 Länge des Headers ohne diese 2 Byte - 7..8 2 Typ des Headers + Byte Länge Inhalt + 0..3 4 Länge des Paketes ohne diese 4 Byte + 4 1 Prüfsumme über die Länge. Stimmt sie nicht wird die Verbindung geschlossen + 5..6 2 Länge des Headers ohne diese 2 Byte + 7..8 2 Typ des Headers CH_SimpleMultiChannel: - 9..10 2 Channel -CH_Handshake Internal Use ONLY + 9..10 2 Channel +CH_Handshake Internal Use ONLY Keine Weiteren Daten! **/ typedef comm_UINT16 CMProtocol; -#define CM_PROTOCOL_OLDSTYLE (CMProtocol)0x0001 -#define CM_PROTOCOL_MARS (CMProtocol)0x0001 -#define CM_PROTOCOL_BROADCASTER (CMProtocol)0x0002 -#define CM_PROTOCOL_USER_START (CMProtocol)0x0100 +#define CM_PROTOCOL_OLDSTYLE (CMProtocol)0x0001 +#define CM_PROTOCOL_MARS (CMProtocol)0x0001 +#define CM_PROTOCOL_BROADCASTER (CMProtocol)0x0002 +#define CM_PROTOCOL_USER_START (CMProtocol)0x0100 typedef comm_USHORT HandshakeType; typedef comm_USHORT CommunicationOption; -#define CH_NoHeader 0x0000 -#define CH_SimpleMultiChannel 0x0001 -#define CH_Handshake 0x0002 +#define CH_NoHeader 0x0000 +#define CH_SimpleMultiChannel 0x0001 +#define CH_Handshake 0x0002 -#define CH_REQUEST_HandshakeAlive ((HandshakeType)0x0101) /// Fordert eine Alive Antwort an -#define CH_RESPONSE_HandshakeAlive ((HandshakeType)0x0102) /// Alive Antwort +#define CH_REQUEST_HandshakeAlive ((HandshakeType)0x0101) /// Fordert eine Alive Antwort an +#define CH_RESPONSE_HandshakeAlive ((HandshakeType)0x0102) /// Alive Antwort /** Announce supported options: Client announces available options Server returns subset of these options (note that the sbset can be the entire set also) **/ -#define CH_SUPPORT_OPTIONS ((HandshakeType)0x0103) -#define OPT_USE_SHUTDOWN_PROTOCOL ((CommunicationOption)0x0001) +#define CH_SUPPORT_OPTIONS ((HandshakeType)0x0103) +#define OPT_USE_SHUTDOWN_PROTOCOL ((CommunicationOption)0x0001) /// these are for making sure all Data is read prior to shutting sown the link -#define CH_REQUEST_ShutdownLink ((HandshakeType)0x0104) /// Request to Shutdown this link -#define CH_ShutdownLink ((HandshakeType)0x0105) /// Shutdown this link +#define CH_REQUEST_ShutdownLink ((HandshakeType)0x0104) /// Request to Shutdown this link +#define CH_ShutdownLink ((HandshakeType)0x0105) /// Shutdown this link -#define CH_SetApplication ((HandshakeType)0x0106) /// Set Description of Client +#define CH_SetApplication ((HandshakeType)0x0106) /// Set Description of Client /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index 1dc7f4383559..b95f894ed02c 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,10 +28,10 @@ /************************************************************************* * - * ATTENTION - * This file is intended to supply the types and defines for Environment independent - * building of the packethandler - * Only adaption of this file should be necessary. Else it is a bug! + * ATTENTION + * This file is intended to supply the types and defines for Environment independent + * building of the packethandler + * Only adaption of this file should be necessary. Else it is a bug! * Eather including apropriate files or defining the types when not available in the environment * ************************************************************************/ diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx index 5f873f5b393f..079deb703ce5 100644 --- a/automation/inc/automation/communi.hxx +++ b/automation/inc/automation/communi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class MultiCommunicationManager : public CommunicationManager public: MultiCommunicationManager( BOOL bUseMultiChannel = FALSE ); virtual ~MultiCommunicationManager(); - virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an + virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an virtual BOOL IsLinkValid( CommunicationLink* pCL ); virtual USHORT GetCommunicationLinkCount(); virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr ); @@ -58,9 +58,9 @@ protected: virtual void CallConnectionOpened( CommunicationLink* pCL ); virtual void CallConnectionClosed( CommunicationLink* pCL ); CommunicationLinkList *ActiveLinks; - CommunicationLinkList *InactiveLinks; /// Hier sind die CommunicationLinks drin, die sich noch nicht selbst abgemeldet haben. + CommunicationLinkList *InactiveLinks; /// Hier sind die CommunicationLinks drin, die sich noch nicht selbst abgemeldet haben. /// allerdings schon ein StopCommunication gekriegt haben, bzw ein ConnectionTerminated - virtual void DestroyingLink( CommunicationLink *pCL ); // Link trägt sich im Destruktor aus + virtual void DestroyingLink( CommunicationLink *pCL ); // Link trägt sich im Destruktor aus BOOL bGracefullShutdown; }; @@ -150,7 +150,7 @@ private: ULONG nPortToListen; USHORT nMaxConnections; ULONG nAddConnectionEventId; - osl::Mutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist + osl::Mutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist void CallInfoMsg( InfoString aMsg ){ pMyServer->CallInfoMsg( aMsg ); } CM_InfoType GetInfoType(){ return pMyServer->GetInfoType(); } diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx index 91a44f17f639..65da5a091667 100644 --- a/automation/inc/automation/simplecm.hxx +++ b/automation/inc/automation/simplecm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,32 +38,32 @@ #include <automation/commdefines.hxx> // CM steht für CommunicationManager -#define CM_UNLIMITED_CONNECTIONS 0xffff +#define CM_UNLIMITED_CONNECTIONS 0xffff typedef USHORT CM_NameType; -#define CM_DOTTED ( (CM_NameType) 01 ) -#define CM_FQDN ( (CM_NameType) 02 ) +#define CM_DOTTED ( (CM_NameType) 01 ) +#define CM_FQDN ( (CM_NameType) 02 ) typedef USHORT CM_InfoType; // nur eines dieser 3 defines darf verwendet werden -#define CM_NO_TEXT ( (CM_InfoType) 01 ) -#define CM_SHORT_TEXT ( (CM_InfoType) 02 ) -#define CM_VERBOSE_TEXT ( (CM_InfoType) 03 ) +#define CM_NO_TEXT ( (CM_InfoType) 01 ) +#define CM_SHORT_TEXT ( (CM_InfoType) 02 ) +#define CM_VERBOSE_TEXT ( (CM_InfoType) 03 ) -#define CM_OPEN ( (CM_InfoType) 0x0004 ) -#define CM_CLOSE ( (CM_InfoType) 0x0008 ) -#define CM_RECEIVE ( (CM_InfoType) 0x0010 ) -#define CM_SEND ( (CM_InfoType) 0x0020 ) -#define CM_ERROR ( (CM_InfoType) 0x0040 ) -#define CM_MISC ( (CM_InfoType) 0x0080 ) +#define CM_OPEN ( (CM_InfoType) 0x0004 ) +#define CM_CLOSE ( (CM_InfoType) 0x0008 ) +#define CM_RECEIVE ( (CM_InfoType) 0x0010 ) +#define CM_SEND ( (CM_InfoType) 0x0020 ) +#define CM_ERROR ( (CM_InfoType) 0x0040 ) +#define CM_MISC ( (CM_InfoType) 0x0080 ) -#define CM_USER_1 ( (CM_InfoType) 0x0100 ) -#define CM_USER_2 ( (CM_InfoType) 0x0200 ) -#define CM_USER_3 ( (CM_InfoType) 0x0400 ) -#define CM_USER_4 ( (CM_InfoType) 0x0800 ) +#define CM_USER_1 ( (CM_InfoType) 0x0100 ) +#define CM_USER_2 ( (CM_InfoType) 0x0200 ) +#define CM_USER_3 ( (CM_InfoType) 0x0400 ) +#define CM_USER_4 ( (CM_InfoType) 0x0800 ) -#define CM_ALL ( CM_OPEN | CM_CLOSE | CM_RECEIVE | CM_SEND | CM_ERROR | CM_MISC ) -#define CM_NONE ( 0 ) +#define CM_ALL ( CM_OPEN | CM_CLOSE | CM_RECEIVE | CM_SEND | CM_ERROR | CM_MISC ) +#define CM_NONE ( 0 ) #define CByteString( constAsciiStr ) ByteString( RTL_CONSTASCII_STRINGPARAM ( constAsciiStr ) ) @@ -100,12 +100,12 @@ typedef USHORT CM_InfoType; class CommunicationLink; /*#undef PRV_SV_DECL_REF_LOCK -#define PRV_SV_DECL_REF_LOCK(ClassName, Ref) \ -protected: \ - ClassName * pObj; \ -public: \ -PRV_SV_DECL_REF_SIGNATURE(ClassName, Ref) \ - inline ClassName##Ref( void * pObjP ){ClassName##Ref ((ClassName *) pObjP);} \ +#define PRV_SV_DECL_REF_LOCK(ClassName, Ref) \ +protected: \ + ClassName * pObj; \ +public: \ +PRV_SV_DECL_REF_SIGNATURE(ClassName, Ref) \ + inline ClassName##Ref( void * pObjP ){ClassName##Ref ((ClassName *) pObjP);} \ */ SV_DECL_REF( CommunicationLink ) @@ -135,7 +135,7 @@ protected: friend class CommunicationManagerServerAcceptThread; // Darf nicht abgeräumt werden zwischen Empfang des Streams und ende des Callbacks -protected: // so daß nur über Ref gelöscht werden kann +protected: // so daß nur über Ref gelöscht werden kann virtual ~CommunicationLink(); void InvalidateManager() { pMyManager = NULL; } @@ -148,13 +148,13 @@ public: virtual BOOL IsCommunicationError()=0; CommunicationManager* GetCommunicationManager(){ return pMyManager; } -// Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren +// Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren virtual ByteString GetCommunicationPartner( CM_NameType eType )=0; -// Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren +// Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren virtual ByteString GetMyName( CM_NameType eType )=0; -// Liefert einen neuen Stream zum Versenden von Daten. +// Liefert einen neuen Stream zum Versenden von Daten. virtual SvStream* GetBestCommunicationStream()=0; /** will call virtual function DoTransferDataStream to do actual work @@ -205,7 +205,7 @@ protected: virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL)=0; - virtual BOOL ShutdownCommunication() = 0; /// Really stop the Communication + virtual BOOL ShutdownCommunication() = 0; /// Really stop the Communication /// Statistics DateTime aStart; @@ -238,14 +238,14 @@ public: virtual BOOL StartCommunication()=0; virtual BOOL StartCommunication( String aApp, String aParams ); virtual BOOL StartCommunication( ByteString aHost, ULONG nPort ); - virtual BOOL StopCommunication()=0; // Hält alle CommunicationLinks an + virtual BOOL StopCommunication()=0; // Hält alle CommunicationLinks an virtual BOOL IsCommunicationRunning() { return bIsCommunicationRunning; } -// virtual BOOL IsCommunicationError(); +// virtual BOOL IsCommunicationError(); -// Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren +// Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren virtual ByteString GetMyName( CM_NameType eType ); - virtual BOOL IsLinkValid( CommunicationLink* pCL )=0; // Notwendig für call im Destruktor + virtual BOOL IsLinkValid( CommunicationLink* pCL )=0; // Notwendig für call im Destruktor virtual USHORT GetCommunicationLinkCount()=0; virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr )=0; @@ -275,7 +275,7 @@ protected: CM_InfoType nInfoType; - // Diese Routinen rufen den Link oder sind überladen + // Diese Routinen rufen den Link oder sind überladen virtual void ConnectionOpened( CommunicationLink* pCL ){ mlConnectionOpened.Call( pCL ); } virtual void ConnectionClosed( CommunicationLink* pCL ){ mlConnectionClosed.Call( pCL ); } virtual void DataReceived( CommunicationLink* pCL ){ mlDataReceived.Call( pCL ); } @@ -283,7 +283,7 @@ protected: BOOL bIsCommunicationRunning; - virtual void DestroyingLink( CommunicationLink *pCL )=0; // Link trägt sich im Destruktor aus + virtual void DestroyingLink( CommunicationLink *pCL )=0; // Link trägt sich im Destruktor aus private: ByteString maApplication; @@ -301,7 +301,7 @@ class SingleCommunicationManager : public CommunicationManager public: SingleCommunicationManager( BOOL bUseMultiChannel = FALSE ); virtual ~SingleCommunicationManager(); - virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an + virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an virtual BOOL IsLinkValid( CommunicationLink* pCL ); virtual USHORT GetCommunicationLinkCount(); virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr ); @@ -311,14 +311,14 @@ protected: virtual void CallConnectionClosed( CommunicationLink* pCL ); CommunicationLinkRef xActiveLink; CommunicationLink *pInactiveLink; - virtual void DestroyingLink( CommunicationLink *pCL ); // Link trägt sich im Destruktor aus + virtual void DestroyingLink( CommunicationLink *pCL ); // Link trägt sich im Destruktor aus }; class ICommunicationManagerClient { friend class CommonSocketFunctions; protected: - virtual BOOL RetryConnect() { return FALSE; } // Kann dann eventuell die Applikation starten + virtual BOOL RetryConnect() { return FALSE; } // Kann dann eventuell die Applikation starten }; class TCPIO; @@ -348,7 +348,7 @@ protected: void SetStreamSocket( osl::StreamSocket* pSocket ); SvStream *pReceiveStream; - BOOL DoReceiveDataStream(); /// Recieve DataPacket from Socket + BOOL DoReceiveDataStream(); /// Recieve DataPacket from Socket virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL); bool IsReceiveReady(); BOOL bIsRequestShutdownPending; @@ -363,7 +363,7 @@ public: ~SimpleCommunicationLinkViaSocketWithReceiveCallbacks(); virtual BOOL ReceiveDataStream(); protected: - virtual BOOL ShutdownCommunication(); /// Really stop the Communication + virtual BOOL ShutdownCommunication(); /// Really stop the Communication virtual void WaitForShutdown(); }; diff --git a/automation/inc/pch/precompiled_automation.cxx b/automation/inc/pch/precompiled_automation.cxx index e07b325283d8..0c5612989c7b 100644 --- a/automation/inc/pch/precompiled_automation.cxx +++ b/automation/inc/pch/precompiled_automation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/automation/inc/pch/precompiled_automation.hxx b/automation/inc/pch/precompiled_automation.hxx index 05a8e8250f74..8f1227723042 100644 --- a/automation/inc/pch/precompiled_automation.hxx +++ b/automation/inc/pch/precompiled_automation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |