diff options
Diffstat (limited to 'automation/source')
63 files changed, 1349 insertions, 1349 deletions
diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx index 101d72b3471b..12fc5c057112 100644 --- a/automation/source/app/testbasi.cxx +++ b/automation/source/app/testbasi.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/source/app/testbasi.hxx b/automation/source/app/testbasi.hxx index 89d870a66cb4..7b375d60dfce 100644 --- a/automation/source/app/testbasi.hxx +++ b/automation/source/app/testbasi.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 @@ -34,7 +34,7 @@ class ErrorEntry; -#define SBXID_TTBASIC 0x5454 // TTBasic: TT +#define SBXID_TTBASIC 0x5454 // TTBasic: TT #define SBXCR_TEST2 0x54534554L // TEST @@ -51,10 +51,10 @@ public: // nicht mit #ifdefs klammern, da diese Headerdatei für testtool und basic // gleichermaßen verwendet wird. DECL_LINK( CErrorImpl, ErrorEntry* ); -// SbxObject *pTestObject; // für das Testtool; ansonsten NULL +// SbxObject *pTestObject; // für das Testtool; ansonsten NULL void LoadIniFile(); - SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl ); // Besimmt den erweiterten Symboltyp für das Syntaxhighlighting + SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl ); // Besimmt den erweiterten Symboltyp für das Syntaxhighlighting virtual const String GetSpechialErrorText(); virtual void ReportRuntimeError( AppBasEd *pEditWin ); virtual void DebugFindNoErrors( BOOL bDebugFindNoErrors ); diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx index f19b095449ff..ede17dd23ed0 100644 --- a/automation/source/communi/communi.cxx +++ b/automation/source/communi/communi.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 @@ -44,9 +44,9 @@ #include <automation/communi.hxx> -/* Um den Destruktor protected zu machen wurde unten das delete entfernt. +/* Um den Destruktor protected zu machen wurde unten das delete entfernt. Die Methode wird ohnehin hucht benutzt. -// delete *((AE*)pData+n); +// delete *((AE*)pData+n); */ #undef SV_IMPL_PTRARR_SORT @@ -67,7 +67,7 @@ _SV_SEEK_PTR( nm, AE ) SV_IMPL_PTRARR_SORT( CommunicationLinkList, CommunicationLink* ); -osl::Mutex *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest +osl::Mutex *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket ) : SimpleCommunicationLinkViaSocket( pMan, pSocket ) @@ -126,10 +126,10 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication() if ( GetStreamSocket() ) GetStreamSocket()->shutdown(); - if ( GetStreamSocket() ) // Mal wieder nach oben verschoben, da sonst nicht vom Read runtergesprungen wird. + if ( GetStreamSocket() ) // Mal wieder nach oben verschoben, da sonst nicht vom Read runtergesprungen wird. GetStreamSocket()->close(); - resume(); // So daß das run auch die Schleife verlassen kann + resume(); // So daß das run auch die Schleife verlassen kann join(); @@ -137,7 +137,7 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication() SetStreamSocket( NULL ); delete pTempSocket; -// ConnectionClosed(); Wird am Ende des Thread gerufen +// ConnectionClosed(); Wird am Ende des Thread gerufen } else @@ -174,7 +174,7 @@ void CommunicationLinkViaSocket::WaitForShutdown() { if ( !bShutdownStarted ) { - aShutdownTimer.SetTimeout( 30000 ); // Should be 30 Seconds + aShutdownTimer.SetTimeout( 30000 ); // Should be 30 Seconds aShutdownTimer.SetTimeoutHdl( LINK( this, CommunicationLinkViaSocket, ShutdownLink ) ); aShutdownTimer.Start(); bShutdownStarted = TRUE; @@ -205,7 +205,7 @@ void CommunicationLinkViaSocket::run() continue; TimeValue sNochEins = {0, 1000000}; - while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist + while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist wait( sNochEins ); SetNewPacketAsCurrent(); StartCallback(); @@ -216,7 +216,7 @@ void CommunicationLinkViaSocket::run() } } TimeValue sNochEins = {0, 1000000}; - while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist + while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist wait( sNochEins ); StartCallback(); @@ -240,7 +240,7 @@ long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG ) { { osl::MutexGuard aGuard( aMConnectionClosed ); - nConnectionClosedEventId = 0; // Achtung!! alles andere muß oben gemacht werden. + nConnectionClosedEventId = 0; // Achtung!! alles andere muß oben gemacht werden. } ShutdownCommunication(); return CommunicationLink::ConnectionClosed( ); @@ -251,7 +251,7 @@ long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG ) { { osl::MutexGuard aGuard( aMDataReceived ); - nDataReceivedEventId = 0; // Achtung!! alles andere muß oben gemacht werden. + nDataReceivedEventId = 0; // Achtung!! alles andere muß oben gemacht werden. } return CommunicationLink::DataReceived( ); } @@ -359,7 +359,7 @@ CommunicationLinkRef MultiCommunicationManager::GetCommunicationLink( USHORT nNr void MultiCommunicationManager::CallConnectionOpened( CommunicationLink* pCL ) { - CommunicationLinkRef rHold(pCL); // Hält den Zeiger bis zum Ende des calls + CommunicationLinkRef rHold(pCL); // Hält den Zeiger bis zum Ende des calls ActiveLinks->C40_PTR_INSERT(CommunicationLink, pCL); rHold->AddRef(); @@ -368,20 +368,20 @@ void MultiCommunicationManager::CallConnectionOpened( CommunicationLink* pCL ) void MultiCommunicationManager::CallConnectionClosed( CommunicationLink* pCL ) { - CommunicationLinkRef rHold(pCL); // Hält denm Zeiger bis zum Ende des calls + CommunicationLinkRef rHold(pCL); // Hält denm Zeiger bis zum Ende des calls CommunicationManager::CallConnectionClosed( pCL ); USHORT nPos; if ( ActiveLinks->Seek_Entry( pCL, &nPos ) ) { - InactiveLinks->C40_PTR_INSERT(CommunicationLink, pCL); // Ohne Reference + InactiveLinks->C40_PTR_INSERT(CommunicationLink, pCL); // Ohne Reference ActiveLinks->Remove( nPos ); } pCL->ReleaseReference(); bIsCommunicationRunning = ActiveLinks->Count() > 0; -// delete pCL; +// delete pCL; #if OSL_DEBUG_LEVEL > 1 rHold->bFlag = TRUE; #endif @@ -461,16 +461,16 @@ CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread( CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread() { -#ifndef aUNX // Weil das Accept nicht abgebrochen werden kann, so terminiert wenigstens das Prog +#ifndef aUNX // Weil das Accept nicht abgebrochen werden kann, so terminiert wenigstens das Prog // #62855# pl: gilt auch bei anderen Unixen // die richtige Loesung waere natuerlich, etwas auf die pipe zu schreiben, // was der thread als Abbruchbedingung erkennt // oder wenigstens ein kill anstatt join terminate(); if ( pAcceptorSocket ) - pAcceptorSocket->close(); // Dann das Accept unterbrechen + pAcceptorSocket->close(); // Dann das Accept unterbrechen - join(); // Warten bis fertig + join(); // Warten bis fertig if ( pAcceptorSocket ) { @@ -491,7 +491,7 @@ CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread( CByteString( "AddConnectionEvent aus Queue gelöscht"), CM_MISC, xNewConnection ); xNewConnection->InvalidateManager(); - xNewConnection.Clear(); // sollte das Objekt hier löschen + xNewConnection.Clear(); // sollte das Objekt hier löschen } } } @@ -527,7 +527,7 @@ void CommunicationManagerServerAcceptThread::run() pStreamSocket->setOption( osl_Socket_OptionTcpNoDelay, 1 ); TimeValue sNochEins = {0, 100}; - while ( schedule() && xmNewConnection.Is() ) // Solange die letzte Connection nicht abgeholt wurde warten wir + while ( schedule() && xmNewConnection.Is() ) // Solange die letzte Connection nicht abgeholt wurde warten wir wait( sNochEins ); xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket ); xmNewConnection->StartCallback(); diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx index 0170b08aefe0..8ac97299e1cf 100644 --- a/automation/source/inc/cmdbasestream.hxx +++ b/automation/source/inc/cmdbasestream.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! * ************************************************************************/ diff --git a/automation/source/inc/icommstream.hxx b/automation/source/inc/icommstream.hxx index adc9be16063e..cb74977d6274 100644 --- a/automation/source/inc/icommstream.hxx +++ b/automation/source/inc/icommstream.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! * ************************************************************************/ @@ -46,19 +46,19 @@ public: ICommStream(){} virtual ~ICommStream(){} - virtual ICommStream& operator>>( comm_USHORT& rUShort )=0; - virtual ICommStream& operator>>( comm_ULONG& rULong )=0; - virtual ICommStream& operator>>( comm_BOOL& rChar )=0; + virtual ICommStream& operator>>( comm_USHORT& rUShort )=0; + virtual ICommStream& operator>>( comm_ULONG& rULong )=0; + virtual ICommStream& operator>>( comm_BOOL& rChar )=0; - virtual ICommStream& operator<<( comm_USHORT nUShort )=0; - virtual ICommStream& operator<<( comm_ULONG nULong )=0; - virtual ICommStream& operator<<( comm_BOOL nChar )=0; + virtual ICommStream& operator<<( comm_USHORT nUShort )=0; + virtual ICommStream& operator<<( comm_ULONG nULong )=0; + virtual ICommStream& operator<<( comm_BOOL nChar )=0; - virtual comm_ULONG Read( void* pData, comm_ULONG nSize )=0; - virtual comm_ULONG Write( const void* pData, comm_ULONG nSize )=0; + virtual comm_ULONG Read( void* pData, comm_ULONG nSize )=0; + virtual comm_ULONG Write( const void* pData, comm_ULONG nSize )=0; - virtual comm_BOOL IsEof() const=0; - virtual comm_ULONG SeekRel( long nPos )=0; + virtual comm_BOOL IsEof() const=0; + virtual comm_ULONG SeekRel( long nPos )=0; }; diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx index f3609b9de3d9..e8beabe2b63b 100644 --- a/automation/source/inc/rcontrol.hxx +++ b/automation/source/inc/rcontrol.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! * ************************************************************************/ @@ -38,34 +38,34 @@ #define _RCONTROL_HXX -#define UID_ACTIVE 0 +#define UID_ACTIVE 0 -#define SI_IPCCommandBlock 1 -#define SI_SocketCommandBlock SI_IPCCommandBlock // Zumindest erstmal -#define SI_DirectCommandBlock 2 -#define SIControl 3 -#define SISlot 4 -#define SIFlow 5 -#define SICommand 6 -#define SIUnoSlot 7 -#define SIStringControl 8 +#define SI_IPCCommandBlock 1 +#define SI_SocketCommandBlock SI_IPCCommandBlock // Zumindest erstmal +#define SI_DirectCommandBlock 2 +#define SIControl 3 +#define SISlot 4 +#define SIFlow 5 +#define SICommand 6 +#define SIUnoSlot 7 +#define SIStringControl 8 -#define SIReturnBlock 11 -#define SIReturn 12 -#define SIReturnError 13 +#define SIReturnBlock 11 +#define SIReturn 12 +#define SIReturnError 13 // Typisierung im Stream -#define BinUSHORT 11 -#define BinULONG 14 -#define BinString 12 -#define BinBool 13 -#define BinSbxValue 15 +#define BinUSHORT 11 +#define BinULONG 14 +#define BinString 12 +#define BinBool 13 +#define BinSbxValue 15 // Classes // !!!Diese Defines duerfen niemals geaendert werden!!! -#define C_NoType -1 +#define C_NoType -1 // Maximale 32 einfache Controls #define C_TabControl 0 #define C_RadioButton 1 @@ -79,62 +79,62 @@ #define C_PushButton 9 #define C_SpinField 10 -#define C_PatternField 11 -#define C_NumericField 12 -#define C_MetricField 13 -#define C_CurrencyField 14 -#define C_DateField 15 -#define C_TimeField 16 - -#define C_ImageRadioButton 17 -#define C_NumericBox 18 -#define C_MetricBox 19 -#define C_CurrencyBox 20 -#define C_DateBox 21 -#define C_TimeBox 22 - -#define C_ImageButton 23 -#define C_MenuButton 24 -#define C_MoreButton 25 +#define C_PatternField 11 +#define C_NumericField 12 +#define C_MetricField 13 +#define C_CurrencyField 14 +#define C_DateField 15 +#define C_TimeField 16 + +#define C_ImageRadioButton 17 +#define C_NumericBox 18 +#define C_MetricBox 19 +#define C_CurrencyBox 20 +#define C_DateBox 21 +#define C_TimeBox 22 + +#define C_ImageButton 23 +#define C_MenuButton 24 +#define C_MoreButton 25 // Maximale 7 Container -#define C_TabPage 32 +#define C_TabPage 32 #define C_ModalDlg 33 -#define C_FloatWin 34 -#define C_ModelessDlg 35 -#define C_WorkWin 36 +#define C_FloatWin 34 +#define C_ModelessDlg 35 +#define C_WorkWin 36 #define C_DockingWin 37 // Diese Defines koennen geaendert werden -#define C_MessBox 40 -#define C_InfoBox 41 -#define C_WarningBox 42 -#define C_ErrorBox 43 -#define C_QueryBox 44 +#define C_MessBox 40 +#define C_InfoBox 41 +#define C_WarningBox 42 +#define C_ErrorBox 43 +#define C_QueryBox 44 -#define C_TabDlg 45 -#define C_SingleTabDlg 46 +#define C_TabDlg 45 +#define C_SingleTabDlg 46 -#define C_Window 47 +#define C_Window 47 -#define C_PatternBox 60 -#define C_ToolBox 61 -#define C_ValueSet 62 -#define C_Control 63 +#define C_PatternBox 60 +#define C_ToolBox 61 +#define C_ValueSet 62 +#define C_Control 63 #define C_TreeListBox 64 // Hurray the TreeListBox finally got its own Window Type -#define C_OkButton 65 -#define C_CancelButton 66 -#define C_ButtonDialog 67 +#define C_OkButton 65 +#define C_CancelButton 66 +#define C_ButtonDialog 67 -#define C_Dialog 68 +#define C_Dialog 68 -#define M_WITH_RETURN 0x0200 // Die Variable wird zum Aufnehmen des Wertes gespeichert -#define M_KEY_STRING 0x0400 // Key Befehle werden umgewandelt i.e. "<return><up>" +#define M_WITH_RETURN 0x0200 // Die Variable wird zum Aufnehmen des Wertes gespeichert +#define M_KEY_STRING 0x0400 // Key Befehle werden umgewandelt i.e. "<return><up>" #define M_SOFFICE 0x0800 // Command valid for Star/Open Office #define M_MOZILLA 0x1000 // Command valid for Mozilla // for MacroRecorder @@ -154,57 +154,57 @@ #define M_SetPage 31 #define M_Click 32 -#define M_Close 33 // Push Buttons on Dialog (Auch More Button) +#define M_Close 33 // Push Buttons on Dialog (Auch More Button) #define M_Cancel 34 #define M_OK 35 #define M_Help 36 -#define M_Default 37 // Push defaultbutton on Dialog +#define M_Default 37 // Push defaultbutton on Dialog -#define M_Yes 38 -#define M_No 39 -#define M_Repeat 40 +#define M_Yes 38 +#define M_No 39 +#define M_Repeat 40 -#define M_Open 41 -#define M_Pick 42 -#define M_Move 43 -#define M_Size 44 -#define M_Minimize 45 -#define M_Maximize 46 -#define M_Dock 47 -#define M_Undock 48 +#define M_Open 41 +#define M_Pick 42 +#define M_Move 43 +#define M_Size 44 +#define M_Minimize 45 +#define M_Maximize 46 +#define M_Dock 47 +#define M_Undock 48 -#define M_TypeKeys ( M_KEY_STRING | 50 ) -#define M_MouseDown 51 -#define M_MouseUp 52 -#define M_MouseMove 53 -#define M_MouseDoubleClick 54 -#define M_SnapShot 55 -#define M_SetNextToolBox 56 -#define M_OpenContextMenu 57 -#define M_MultiSelect 58 +#define M_TypeKeys ( M_KEY_STRING | 50 ) +#define M_MouseDown 51 +#define M_MouseUp 52 +#define M_MouseMove 53 +#define M_MouseDoubleClick 54 +#define M_SnapShot 55 +#define M_SetNextToolBox 56 +#define M_OpenContextMenu 57 +#define M_MultiSelect 58 // Filedialog -#define M_SetPath 60 -#define M_SetCurFilter 61 +#define M_SetPath 60 +#define M_SetCurFilter 61 // Printdialog -#define M_SetPrinter 70 -#define M_CheckRange 71 -#define M_SetRangeText 72 -#define M_SetFirstPage 73 -#define M_SetLastPage 74 -#define M_CheckCollate 75 -#define M_SetPageId 76 -#define M_SetPageNr 77 - -#define M_AnimateMouse 78 -#define M_TearOff 79 - -#define M_FadeIn 80 -#define M_FadeOut 81 -#define M_Pin 82 +#define M_SetPrinter 70 +#define M_CheckRange 71 +#define M_SetRangeText 72 +#define M_SetFirstPage 73 +#define M_SetLastPage 74 +#define M_CheckCollate 75 +#define M_SetPageId 76 +#define M_SetPageNr 77 + +#define M_AnimateMouse 78 +#define M_TearOff 79 + +#define M_FadeIn 80 +#define M_FadeOut 81 +#define M_Pin 82 #define M_UseMenu 83 // Use the menu of the next possible parent of given Window @@ -212,73 +212,73 @@ #define M_Restore 85 // Window Control together with M_Maximize and M_Minimize -#define M_DisplayPercent 200 // Zum Anzeigen der Prozente des Windows +#define M_DisplayPercent 200 // Zum Anzeigen der Prozente des Windows -#define M_LAST_NO_RETURN 200 +#define M_LAST_NO_RETURN 200 #if ( M_LAST_NO_RETURN >= M_WITH_RETURN ) #error "Bereich überschritten" #endif -#define M_Exists ( M_WITH_RETURN | 1 ) -#define M_NotExists ( M_WITH_RETURN | 2 ) -#define M_IsEnabled ( M_WITH_RETURN | 3 ) -#define M_IsVisible ( M_WITH_RETURN | 4 ) -#define M_IsWritable ( M_WITH_RETURN | 5 ) - -#define M_GetPage ( M_WITH_RETURN | 6 ) -#define M_IsChecked ( M_WITH_RETURN | 7 ) -#define M_IsTristate ( M_WITH_RETURN | 8 ) -#define M_GetState ( M_WITH_RETURN | 9 ) -#define M_GetText ( M_WITH_RETURN | 10 ) -#define M_GetSelCount ( M_WITH_RETURN | 11 ) -#define M_GetSelIndex ( M_WITH_RETURN | 12 ) -#define M_GetSelText ( M_WITH_RETURN | 13 ) -#define M_GetItemCount ( M_WITH_RETURN | 14 ) -#define M_GetItemText ( M_WITH_RETURN | 15 ) -#define M_IsOpen ( M_WITH_RETURN | 16 ) -#define M_Caption ( M_WITH_RETURN | 17 ) -#define M_IsMax ( M_WITH_RETURN | 18 ) -#define M_IsDocked ( M_WITH_RETURN | 19 ) -#define M_GetRT ( M_WITH_RETURN | 20 ) -#define M_GetPageId ( M_WITH_RETURN | 21 ) -#define M_GetPageCount ( M_WITH_RETURN | 22 ) -#define M_GetPosX ( M_WITH_RETURN | 23 ) -#define M_GetPosY ( M_WITH_RETURN | 24 ) -#define M_GetSizeX ( M_WITH_RETURN | 25 ) -#define M_GetSizeY ( M_WITH_RETURN | 26 ) -#define M_GetNextToolBox ( M_WITH_RETURN | 27 ) -#define M_GetButtonCount ( M_WITH_RETURN | 28 ) -#define M_GetButtonId ( M_WITH_RETURN | 29 ) - -#define M_IsFadeIn ( M_WITH_RETURN | 30 ) -#define M_IsPin ( M_WITH_RETURN | 31 ) +#define M_Exists ( M_WITH_RETURN | 1 ) +#define M_NotExists ( M_WITH_RETURN | 2 ) +#define M_IsEnabled ( M_WITH_RETURN | 3 ) +#define M_IsVisible ( M_WITH_RETURN | 4 ) +#define M_IsWritable ( M_WITH_RETURN | 5 ) + +#define M_GetPage ( M_WITH_RETURN | 6 ) +#define M_IsChecked ( M_WITH_RETURN | 7 ) +#define M_IsTristate ( M_WITH_RETURN | 8 ) +#define M_GetState ( M_WITH_RETURN | 9 ) +#define M_GetText ( M_WITH_RETURN | 10 ) +#define M_GetSelCount ( M_WITH_RETURN | 11 ) +#define M_GetSelIndex ( M_WITH_RETURN | 12 ) +#define M_GetSelText ( M_WITH_RETURN | 13 ) +#define M_GetItemCount ( M_WITH_RETURN | 14 ) +#define M_GetItemText ( M_WITH_RETURN | 15 ) +#define M_IsOpen ( M_WITH_RETURN | 16 ) +#define M_Caption ( M_WITH_RETURN | 17 ) +#define M_IsMax ( M_WITH_RETURN | 18 ) +#define M_IsDocked ( M_WITH_RETURN | 19 ) +#define M_GetRT ( M_WITH_RETURN | 20 ) +#define M_GetPageId ( M_WITH_RETURN | 21 ) +#define M_GetPageCount ( M_WITH_RETURN | 22 ) +#define M_GetPosX ( M_WITH_RETURN | 23 ) +#define M_GetPosY ( M_WITH_RETURN | 24 ) +#define M_GetSizeX ( M_WITH_RETURN | 25 ) +#define M_GetSizeY ( M_WITH_RETURN | 26 ) +#define M_GetNextToolBox ( M_WITH_RETURN | 27 ) +#define M_GetButtonCount ( M_WITH_RETURN | 28 ) +#define M_GetButtonId ( M_WITH_RETURN | 29 ) + +#define M_IsFadeIn ( M_WITH_RETURN | 30 ) +#define M_IsPin ( M_WITH_RETURN | 31 ) // Statusbar -#define M_StatusGetText ( M_WITH_RETURN | 32 ) -#define M_StatusIsProgress ( M_WITH_RETURN | 33 ) +#define M_StatusGetText ( M_WITH_RETURN | 32 ) +#define M_StatusIsProgress ( M_WITH_RETURN | 33 ) #define M_StatusGetItemCount ( M_WITH_RETURN | 34 ) -#define M_StatusGetItemId ( M_WITH_RETURN | 35 ) +#define M_StatusGetItemId ( M_WITH_RETURN | 35 ) // -#define M_GetMouseStyle ( M_WITH_RETURN | 36 ) +#define M_GetMouseStyle ( M_WITH_RETURN | 36 ) // support for Messagebox with checkbox -#define M_GetCheckBoxText ( M_WITH_RETURN | 37 ) +#define M_GetCheckBoxText ( M_WITH_RETURN | 37 ) // Scrollbars -#define M_HasScrollBar ( M_WITH_RETURN | 38 ) +#define M_HasScrollBar ( M_WITH_RETURN | 38 ) #define M_IsScrollBarEnabled ( M_WITH_RETURN | 39 ) // Dieser befehl wird nur intern im Controller (sts library) verwendet. Sie tauchen nicht im Testtool auf! -#define _M_IsEnabled ( M_WITH_RETURN | 50 ) +#define _M_IsEnabled ( M_WITH_RETURN | 50 ) -#define M_GetFixedTextCount ( M_WITH_RETURN | 51 ) -#define M_GetFixedText ( M_WITH_RETURN | 52 ) +#define M_GetFixedTextCount ( M_WITH_RETURN | 51 ) +#define M_GetFixedText ( M_WITH_RETURN | 52 ) -#define M_IsMin ( M_WITH_RETURN | 53 ) +#define M_IsMin ( M_WITH_RETURN | 53 ) #define M_IsRestore ( M_WITH_RETURN | 54 ) #define M_GetItemType ( M_WITH_RETURN | 55 ) @@ -295,39 +295,39 @@ // RemoteCommands -#define RC_AppAbort ( M_SOFFICE | M_MOZILLA | 1 ) -#define RC_SetClipboard ( M_SOFFICE | M_MOZILLA | 2 ) -#define RC_NoDebug ( M_SOFFICE | M_MOZILLA | 3 ) -#define RC_Debug ( M_SOFFICE | M_MOZILLA | 4 ) -#define RC_GPF ( M_SOFFICE | M_MOZILLA | 5 ) -#define RC_DisplayHid ( M_SOFFICE | M_MOZILLA | 6 ) -#define RC_AppDelay ( M_SOFFICE | M_MOZILLA | 7 ) -#define RC_UseBindings ( M_SOFFICE | 8 ) -#define RC_Profile ( M_SOFFICE | M_MOZILLA | 9 ) +#define RC_AppAbort ( M_SOFFICE | M_MOZILLA | 1 ) +#define RC_SetClipboard ( M_SOFFICE | M_MOZILLA | 2 ) +#define RC_NoDebug ( M_SOFFICE | M_MOZILLA | 3 ) +#define RC_Debug ( M_SOFFICE | M_MOZILLA | 4 ) +#define RC_GPF ( M_SOFFICE | M_MOZILLA | 5 ) +#define RC_DisplayHid ( M_SOFFICE | M_MOZILLA | 6 ) +#define RC_AppDelay ( M_SOFFICE | M_MOZILLA | 7 ) +#define RC_UseBindings ( M_SOFFICE | 8 ) +#define RC_Profile ( M_SOFFICE | M_MOZILLA | 9 ) // (Popup)Menu -#define RC_MenuSelect ( M_SOFFICE | M_MOZILLA | 10 ) -#define RC_SetControlType ( M_SOFFICE | 11 ) // deprecated since RTTI +#define RC_MenuSelect ( M_SOFFICE | M_MOZILLA | 10 ) +#define RC_SetControlType ( M_SOFFICE | 11 ) // deprecated since RTTI // RemoteFileAccess -#define RC_Kill ( M_SOFFICE | 12 ) -#define RC_RmDir ( M_SOFFICE | 13 ) -#define RC_MkDir ( M_SOFFICE | 14 ) -#define RC_FileCopy ( M_SOFFICE | 15 ) -#define RC_Name ( M_SOFFICE | 16 ) +#define RC_Kill ( M_SOFFICE | 12 ) +#define RC_RmDir ( M_SOFFICE | 13 ) +#define RC_MkDir ( M_SOFFICE | 14 ) +#define RC_FileCopy ( M_SOFFICE | 15 ) +#define RC_Name ( M_SOFFICE | 16 ) #define RC_CaptureAssertions (M_SOFFICE | M_MOZILLA | 17 ) -#define RC_Assert ( M_SOFFICE | M_MOZILLA | 18 ) +#define RC_Assert ( M_SOFFICE | M_MOZILLA | 18 ) -#define RC_MenuOpen ( M_SOFFICE | M_MOZILLA | 19 ) +#define RC_MenuOpen ( M_SOFFICE | M_MOZILLA | 19 ) -#define RC_TypeKeysDelay ( M_SOFFICE | M_MOZILLA | 20 ) +#define RC_TypeKeysDelay ( M_SOFFICE | M_MOZILLA | 20 ) -#define RC_ShowBar ( M_MOZILLA | 21 ) +#define RC_ShowBar ( M_MOZILLA | 21 ) #define RC_LoadURL ( M_MOZILLA | 22 ) -#define RC_CloseSysDialog ( M_SOFFICE | 23 ) +#define RC_CloseSysDialog ( M_SOFFICE | 23 ) -#define RC_SAXRelease ( M_SOFFICE | 24 ) +#define RC_SAXRelease ( M_SOFFICE | 24 ) #define RC_RecordMacro ( M_SOFFICE | 25 ) @@ -335,43 +335,43 @@ #define RC_CatchGPF ( M_SOFFICE | 27 ) -#define _RC_LAST_NO_RETURN 27 +#define _RC_LAST_NO_RETURN 27 #if ( _RC_LAST_NO_RETURN >= M_WITH_RETURN ) #error "Bereich überschritten" #endif // Befehle mit Returnwert -#define RC_GetClipboard ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 1 ) -#define RC_WinTree ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 2 ) -#define RC_ResetApplication ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 3 ) +#define RC_GetClipboard ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 1 ) +#define RC_WinTree ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 2 ) +#define RC_ResetApplication ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 3 ) #define RC_GetNextCloseWindow ( M_SOFFICE | M_WITH_RETURN | 4 ) -#define RC_ApplicationBusy ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 5 ) +#define RC_ApplicationBusy ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 5 ) // (Popup)Menu -#define RC_MenuGetItemCount ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 6 ) -#define RC_MenuGetItemId ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 7 ) -#define RC_MenuGetItemPos ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 8 ) -#define RC_MenuIsSeperator ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 9 ) +#define RC_MenuGetItemCount ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 6 ) +#define RC_MenuGetItemId ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 7 ) +#define RC_MenuGetItemPos ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 8 ) +#define RC_MenuIsSeperator ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 9 ) #define RC_MenuIsItemChecked ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 10 ) #define RC_MenuIsItemEnabled ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 11 ) -#define RC_MenuGetItemText ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 12 ) +#define RC_MenuGetItemText ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 12 ) // RemoteFileAccess -#define RC_Dir ( M_SOFFICE | M_WITH_RETURN | 18 ) -#define RC_FileLen ( M_SOFFICE | M_WITH_RETURN | 19 ) -#define RC_FileDateTime ( M_SOFFICE | M_WITH_RETURN | 20 ) +#define RC_Dir ( M_SOFFICE | M_WITH_RETURN | 18 ) +#define RC_FileLen ( M_SOFFICE | M_WITH_RETURN | 19 ) +#define RC_FileDateTime ( M_SOFFICE | M_WITH_RETURN | 20 ) -#define RC_Translate ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 21 ) -#define RC_GetMouseStyle ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 22 ) -#define RC_UnpackStorage ( M_SOFFICE | M_WITH_RETURN | 23 ) +#define RC_Translate ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 21 ) +#define RC_GetMouseStyle ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 22 ) +#define RC_UnpackStorage ( M_SOFFICE | M_WITH_RETURN | 23 ) -#define RC_IsBarVisible ( M_MOZILLA | M_WITH_RETURN | 24 ) +#define RC_IsBarVisible ( M_MOZILLA | M_WITH_RETURN | 24 ) #define RC_MenuGetItemCommand ( M_SOFFICE | M_MOZILLA | M_WITH_RETURN | 25 ) #define RC_ExistsSysDialog ( M_SOFFICE | M_WITH_RETURN | 26 ) #define RC_SAXCheckWellformed ( M_SOFFICE | M_WITH_RETURN | 27 ) -#define RC_SAXReadFile ( M_SOFFICE | M_WITH_RETURN | 28 ) +#define RC_SAXReadFile ( M_SOFFICE | M_WITH_RETURN | 28 ) #define RC_SAXGetNodeType ( M_SOFFICE | M_WITH_RETURN | 29 ) #define RC_SAXGetElementName ( M_SOFFICE | M_WITH_RETURN | 30 ) @@ -397,54 +397,54 @@ #define RC_WaitSlot ( M_SOFFICE | M_WITH_RETURN | 44 ) // Flow Control -#define F_EndCommandBlock 101 // Initiiert Rückmeldung des Status -#define F_Sequence 102 // Übergibt Sequence Nummer (1. in jedem Stream) +#define F_EndCommandBlock 101 // Initiiert Rückmeldung des Status +#define F_Sequence 102 // Übergibt Sequence Nummer (1. in jedem Stream) // Return codes -#define RET_Sequence 132 // Übergibt Sequence Nummer (1. in jedem Stream) -#define RET_Value 133 // Übergibt Return-wert -#define RET_WinInfo 134 // Information über aktuelles Fenster/Control -#define RET_ProfileInfo 135 // Profile Information -#define RET_DirectLoging 136 // Direktes Übertragen von Informationen in das Log -#define RET_MacroRecorder 137 // MakroRecorder Befehl übertragen +#define RET_Sequence 132 // Übergibt Sequence Nummer (1. in jedem Stream) +#define RET_Value 133 // Übergibt Return-wert +#define RET_WinInfo 134 // Information über aktuelles Fenster/Control +#define RET_ProfileInfo 135 // Profile Information +#define RET_DirectLoging 136 // Direktes Übertragen von Informationen in das Log +#define RET_MacroRecorder 137 // MakroRecorder Befehl übertragen // Subcodes die in nUId geliefert werden // für F_ProfileInfo -#define S_ProfileReset 201 // nNr1 = Anzahl Borders +#define S_ProfileReset 201 // nNr1 = Anzahl Borders // Achtung!! Diese Defines müssen aufeinanderfolgende Nummern haben!! -#define S_ProfileBorder1 202 // nNr1 = Border1 in ms -#define S_ProfileBorder2 203 // nNr1 = Border2 in ms -#define S_ProfileBorder3 204 // nNr1 = Border3 in ms -#define S_ProfileBorder4 205 // nNr1 = Border4 in ms +#define S_ProfileBorder1 202 // nNr1 = Border1 in ms +#define S_ProfileBorder2 203 // nNr1 = Border2 in ms +#define S_ProfileBorder3 204 // nNr1 = Border3 in ms +#define S_ProfileBorder4 205 // nNr1 = Border4 in ms // Achtung Ende -#define S_ProfileTime 210 // nNr1 = remote Zeit des Befehls -#define S_ProfileDump 211 // Gibt die daten aus. +#define S_ProfileTime 210 // nNr1 = remote Zeit des Befehls +#define S_ProfileDump 211 // Gibt die daten aus. // für F_DirectLoging -#define S_AssertError 220 -#define S_AssertWarning 221 -#define S_AssertTrace 222 -#define S_QAError 223 +#define S_AssertError 220 +#define S_AssertWarning 221 +#define S_AssertTrace 222 +#define S_QAError 223 // Constants which are available in VCLTestTool scripts // Different types of controls recognized via RTTI -#define CONST_CTBrowseBox 100 -#define CONST_CTValueSet 103 +#define CONST_CTBrowseBox 100 +#define CONST_CTValueSet 103 #define CONST_CTORoadmap 104 #define CONST_CTIExtensionListBox 105 #define CONST_CTTableControl 106 -#define CONST_CTUnknown 199 +#define CONST_CTUnknown 199 // Konstanten für das ALignment des gesuchten Splitters -#define CONST_ALIGN_LEFT 120 -#define CONST_ALIGN_TOP 121 -#define CONST_ALIGN_RIGHT 122 -#define CONST_ALIGN_BOTTOM 123 +#define CONST_ALIGN_LEFT 120 +#define CONST_ALIGN_TOP 121 +#define CONST_ALIGN_RIGHT 122 +#define CONST_ALIGN_BOTTOM 123 /// What dialog to use in RC_CloseSysDialog or RC_ExistsSysDialog #define CONST_FilePicker 301 @@ -472,27 +472,27 @@ #define PARAM_NONE 0x0000 #define PARAM_USHORT_1 0x0001 #define PARAM_USHORT_2 0x0002 -#define PARAM_USHORT_3 0x0100 // Nicht in der Reihe!! -#define PARAM_USHORT_4 0x0200 // Nicht in der Reihe!! +#define PARAM_USHORT_3 0x0100 // Nicht in der Reihe!! +#define PARAM_USHORT_4 0x0200 // Nicht in der Reihe!! #define PARAM_ULONG_1 0x0004 #define PARAM_ULONG_2 0x0008 #define PARAM_STR_1 0x0010 #define PARAM_STR_2 0x0020 #define PARAM_BOOL_1 0x0040 #define PARAM_BOOL_2 0x0080 -#define PARAM_SBXVALUE_1 0x0400 // hier mit 0x0400 Weiter!!! Siehe Oben! +#define PARAM_SBXVALUE_1 0x0400 // hier mit 0x0400 Weiter!!! Siehe Oben! // Zusätzliche Beschreibung!! wird auch mit dem Rest verodert -//#define PARAM_STR_RAW 0x8000 // Der Zeichensatz der Strings wird nicht konvertiert(für Fareastern) +//#define PARAM_STR_RAW 0x8000 // Der Zeichensatz der Strings wird nicht konvertiert(für Fareastern) -#define ERR_SEND_TIMEOUT 100 -#define ERR_EXEC_TIMEOUT 101 -#define ERR_RESTART_FAIL 102 -#define ERR_RESTART 103 -#define ERR_NO_WIN 104 // Keine *.Win Dateien gefunden -#define ERR_NO_SID 105 // Keine *.Sid Dateien gefunden -#define ERR_NO_FILE 106 // Datei nicht gefunden +#define ERR_SEND_TIMEOUT 100 +#define ERR_EXEC_TIMEOUT 101 +#define ERR_RESTART_FAIL 102 +#define ERR_RESTART 103 +#define ERR_NO_WIN 104 // Keine *.Win Dateien gefunden +#define ERR_NO_SID 105 // Keine *.Sid Dateien gefunden +#define ERR_NO_FILE 106 // Datei nicht gefunden #endif diff --git a/automation/source/inc/sttresid.hxx b/automation/source/inc/sttresid.hxx index 3ccfe483a8f4..7a416a866db4 100644 --- a/automation/source/inc/sttresid.hxx +++ b/automation/source/inc/sttresid.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/source/inc/svcommstream.hxx b/automation/source/inc/svcommstream.hxx index 0cf289147f04..f3e8ee3d60b5 100644 --- a/automation/source/inc/svcommstream.hxx +++ b/automation/source/inc/svcommstream.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 @@ -41,19 +41,19 @@ public: SvCommStream( SvStream* pIO ); ~SvCommStream(); - ICommStream& operator>>( comm_USHORT& rUShort ); - ICommStream& operator>>( comm_ULONG& rULong ); - ICommStream& operator>>( comm_BOOL& rChar ); + ICommStream& operator>>( comm_USHORT& rUShort ); + ICommStream& operator>>( comm_ULONG& rULong ); + ICommStream& operator>>( comm_BOOL& rChar ); - ICommStream& operator<<( comm_USHORT nUShort ); - ICommStream& operator<<( comm_ULONG nULong ); - ICommStream& operator<<( comm_BOOL nChar ); + ICommStream& operator<<( comm_USHORT nUShort ); + ICommStream& operator<<( comm_ULONG nULong ); + ICommStream& operator<<( comm_BOOL nChar ); - comm_ULONG Read( void* pData, comm_ULONG nSize ); - comm_ULONG Write( const void* pData, comm_ULONG nSize ); + comm_ULONG Read( void* pData, comm_ULONG nSize ); + comm_ULONG Write( const void* pData, comm_ULONG nSize ); - comm_BOOL IsEof() const; - comm_ULONG SeekRel( long nPos ); + comm_BOOL IsEof() const; + comm_ULONG SeekRel( long nPos ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx index 6760fb229af7..ed3ac0af7727 100644 --- a/automation/source/inc/testapp.hxx +++ b/automation/source/inc/testapp.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 @@ -78,82 +78,82 @@ class TestToolObj: public SbxObject friend class TTBasic; friend class Controls; public: - TestToolObj( String aName, String aFilePath ); // Alle Dateien in FilePath, Kein IPC - TestToolObj( String aName, MyBasic* pBas ); // Pfade aus INI, IPC benutzen + TestToolObj( String aName, String aFilePath ); // Alle Dateien in FilePath, Kein IPC + TestToolObj( String aName, MyBasic* pBas ); // Pfade aus INI, IPC benutzen ~TestToolObj(); - void LoadIniFile(); // Laden der IniEinstellungen, die durch den ConfigDialog geändert werden können + void LoadIniFile(); // Laden der IniEinstellungen, die durch den ConfigDialog geändert werden können void DebugFindNoErrors( BOOL bDebugFindNoErrors ); private: - BOOL bWasPrecompilerError; // True wenn beim letzten Precompile ein Fehler auftrat + BOOL bWasPrecompilerError; // True wenn beim letzten Precompile ein Fehler auftrat BOOL CError( ULONG, const String&, xub_StrLen, xub_StrLen, xub_StrLen ); void CalcPosition( String const &aSource, xub_StrLen nPos, xub_StrLen &l, xub_StrLen &c ); xub_StrLen ImplSearch( const String &aSource, const xub_StrLen nStart, const xub_StrLen nEnd, const String &aSearch, const xub_StrLen nSearchStart = 0 ); xub_StrLen PreCompilePart( String &aSource, xub_StrLen nStart, xub_StrLen nEnd, String aFinalErrorLabel, USHORT &nLabelCount ); void PreCompileDispatchParts( String &aSource, String aStart, String aEnd, String aFinalLable ); public: - String GetRevision(String const &aSourceIn); // find Revision in the sourcecode - String PreCompile(String const &aSourceIn); // try catch; testcase endcase .. - BOOL WasPrecompilerError(); // True wenn beim letzten Precompile ein Fehler auftrat - void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); + String GetRevision(String const &aSourceIn); // find Revision in the sourcecode + String PreCompile(String const &aSourceIn); // try catch; testcase endcase .. + BOOL WasPrecompilerError(); // True wenn beim letzten Precompile ein Fehler auftrat + void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); virtual SbxVariable* Find( const String&, SbxClassType ); -// String aKeyPlusClasses; // Pfad für keycodes & classes & res_type (Aus Configdatei) +// String aKeyPlusClasses; // Pfad für keycodes & classes & res_type (Aus Configdatei) DECL_LINK( ReturnResultsLink, CommunicationLink* ); - BOOL ReturnResults( SvStream *pIn ); // Rücklieferung des Antwortstreams über IPC oder TCP/IP oder direkt + BOOL ReturnResults( SvStream *pIn ); // Rücklieferung des Antwortstreams über IPC oder TCP/IP oder direkt - void SetLogHdl( const Link& rLink ) { aLogHdl = rLink; } - const Link& GetLogHdl() const { return aLogHdl; } + void SetLogHdl( const Link& rLink ) { aLogHdl = rLink; } + const Link& GetLogHdl() const { return aLogHdl; } - void SetWinInfoHdl( const Link& rLink ) { aWinInfoHdl = rLink; } - const Link& GetWinInfoHdl() const { return aWinInfoHdl; } + void SetWinInfoHdl( const Link& rLink ) { aWinInfoHdl = rLink; } + const Link& GetWinInfoHdl() const { return aWinInfoHdl; } - void SetModuleWinExistsHdl( const Link& rLink ) { aModuleWinExistsHdl = rLink; } - const Link& GetModuleWinExistsHdl() const { return aModuleWinExistsHdl; } + void SetModuleWinExistsHdl( const Link& rLink ) { aModuleWinExistsHdl = rLink; } + const Link& GetModuleWinExistsHdl() const { return aModuleWinExistsHdl; } - void SetCErrorHdl( const Link& rLink ) { aCErrorHdl = rLink; } - const Link& GetCErrorHdl() const { return aCErrorHdl; } + void SetCErrorHdl( const Link& rLink ) { aCErrorHdl = rLink; } + const Link& GetCErrorHdl() const { return aCErrorHdl; } - void SetWriteStringHdl( const Link& rLink ) { aWriteStringHdl = rLink; } - const Link& GetWriteStringHdl() const { return aWriteStringHdl; } + void SetWriteStringHdl( const Link& rLink ) { aWriteStringHdl = rLink; } + const Link& GetWriteStringHdl() const { return aWriteStringHdl; } SfxBroadcaster& GetTTBroadcaster(); private: - ImplTestToolObj *pImpl; // Alles was von der Implementation abhängt + ImplTestToolObj *pImpl; // Alles was von der Implementation abhängt static const CErrors* GetFehlerListe() { return pFehlerListe; } BOOL bUseIPC; - Link aLogHdl; // Zum Logen der Fehlermeldungen im Testtool - Link aWinInfoHdl; // Anzeigen der Windows/Controls der zu testenden App - Link aModuleWinExistsHdl; // Prüft ob das Modul schon im Editor geladen ist - Link aCErrorHdl; // Melden von Compilererror + Link aLogHdl; // Zum Logen der Fehlermeldungen im Testtool + Link aWinInfoHdl; // Anzeigen der Windows/Controls der zu testenden App + Link aModuleWinExistsHdl; // Prüft ob das Modul schon im Editor geladen ist + Link aCErrorHdl; // Melden von Compilererror Link aWriteStringHdl; // Schreiben von text (e.g. MakroRecorder) - BOOL bReturnOK; // Bricht WaitForAnswer ab - CRevNames *pShortNames; // Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung - ULONG nSequence; // Sequence um Antwort und Anfrage zu syncronisieren - SmartId aNextReturnId; // Id des Returnwertes i.e. UId - void ReplaceNumbers(String &aText); // Zahlen im String mit speziellem Format in Namen umwandeln + BOOL bReturnOK; // Bricht WaitForAnswer ab + CRevNames *pShortNames; // Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung + ULONG nSequence; // Sequence um Antwort und Anfrage zu syncronisieren + SmartId aNextReturnId; // Id des Returnwertes i.e. UId + void ReplaceNumbers(String &aText); // Zahlen im String mit speziellem Format in Namen umwandeln String aLastRecordedKontext;// Keeps the last kontext recorded by the Macro Recorder #define FLAT TRUE - String ProgPath; // Dateiname der zu Testenden APP; Gesetzt über Start - String aLogFileName; // Momentaner Logfilename (Wie Programmdatei aber mit .res) - BOOL IsBlock; // Innerhalb Begin/EndBlock - BOOL SingleCommandBlock; // Implizit um jedes kommando ein Begin/EndBlock + String ProgPath; // Dateiname der zu Testenden APP; Gesetzt über Start + String aLogFileName; // Momentaner Logfilename (Wie Programmdatei aber mit .res) + BOOL IsBlock; // Innerhalb Begin/EndBlock + BOOL SingleCommandBlock; // Implizit um jedes kommando ein Begin/EndBlock CmdStream *In; - void AddName(String &aBisher, String &aNeu ); // Name eventuell mit / anhängen - void AddToListByNr( CNames *&pControls, ControlItemUId *&pNewItem ); // + void AddName(String &aBisher, String &aNeu ); // Name eventuell mit / anhängen + void AddToListByNr( CNames *&pControls, ControlItemUId *&pNewItem ); // CNames *m_pControls; - CNames *m_pNameKontext; // Zeigt auf den aktuellen Namenskontext, der über 'Kontext' gesetzt wurde + CNames *m_pNameKontext; // Zeigt auf den aktuellen Namenskontext, der über 'Kontext' gesetzt wurde CNames *m_pSIds; - CNames *m_pReverseSlots; // Slots mit Kurznamen nach Nummer - CNames *m_pReverseControls; // Controls mit Kurznamen nach Nummer + CNames *m_pReverseSlots; // Slots mit Kurznamen nach Nummer + CNames *m_pReverseControls; // Controls mit Kurznamen nach Nummer CNames *m_pReverseControlsSon;// Controls mit Kurznamen nach Nummer nach Fenstern (Son) - CNames *m_pReverseUIds; // Langnamen nach Nummer + CNames *m_pReverseUIds; // Langnamen nach Nummer - USHORT nMyVar; // Wievielte Var aus Pool ist dran + USHORT nMyVar; // Wievielte Var aus Pool ist dran void InitTestToolObj(); CommunicationManagerClientViaSocketTT *pCommunicationManager; @@ -189,7 +189,7 @@ private: static ControlDefLoad const arR_Cmds[]; static CNames *pRCommands; - static CErrors *pFehlerListe; // Hier werden die Fehler des Testtools gespeichert + static CErrors *pFehlerListe; // Hier werden die Fehler des Testtools gespeichert }; diff --git a/automation/source/inc/testtool.hxx b/automation/source/inc/testtool.hxx index 78a56b3160eb..cd2daa6743e5 100644 --- a/automation/source/inc/testtool.hxx +++ b/automation/source/inc/testtool.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/source/miniapp/editwin.cxx b/automation/source/miniapp/editwin.cxx index 5568b5152320..5cc15cf626f0 100644 --- a/automation/source/miniapp/editwin.cxx +++ b/automation/source/miniapp/editwin.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/source/miniapp/editwin.hxx b/automation/source/miniapp/editwin.hxx index bf7cbfa3ca34..e93db51ebb66 100644 --- a/automation/source/miniapp/editwin.hxx +++ b/automation/source/miniapp/editwin.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 @@ -37,7 +37,7 @@ class GHEditWindow : public FloatingWindow protected: - MultiLineEdit aInhalt; + MultiLineEdit aInhalt; virtual BOOL Close(); // derived void Resize(); diff --git a/automation/source/miniapp/servres.cxx b/automation/source/miniapp/servres.cxx index 3cbb4bf3c80c..bd1ba6110482 100644 --- a/automation/source/miniapp/servres.cxx +++ b/automation/source/miniapp/servres.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/source/miniapp/servres.hrc b/automation/source/miniapp/servres.hrc index 2f95a34a60b6..506b2ecb3025 100644 --- a/automation/source/miniapp/servres.hrc +++ b/automation/source/miniapp/servres.hrc @@ -1,7 +1,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/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx index c93c758ec229..21d796c5448f 100644 --- a/automation/source/miniapp/servres.hxx +++ b/automation/source/miniapp/servres.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/source/miniapp/servres.src b/automation/source/miniapp/servres.src index 426be8b81532..a0516a94a1c5 100644 --- a/automation/source/miniapp/servres.src +++ b/automation/source/miniapp/servres.src @@ -1,7 +1,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/source/miniapp/servuid.hxx b/automation/source/miniapp/servuid.hxx index 7460c097606a..362b803ea808 100644 --- a/automation/source/miniapp/servuid.hxx +++ b/automation/source/miniapp/servuid.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/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx index 539f4851b8e3..d6cdd79f0731 100644 --- a/automation/source/miniapp/testapp.cxx +++ b/automation/source/miniapp/testapp.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 @@ -105,9 +105,9 @@ BOOL MainWindow::Close() void MainWindow::FileExit() { -/* WriteSTBProfile();*/ +/* WriteSTBProfile();*/ -// if (pApp->CloseAll()) +// if (pApp->CloseAll()) pApp->Quit(); } @@ -153,23 +153,23 @@ void MainWindow::SysDlg() /* -#define WB_OK ((WinBits)0x0010) -#define WB_OK_CANCEL ((WinBits)0x0020) -#define WB_YES_NO ((WinBits)0x0040) -#define WB_YES_NO_CANCEL ((WinBits)0x0080) -#define WB_RETRY_CANCEL ((WinBits)0x0100) - -#define WB_DEF_OK ((WinBits)0x0200) -#define WB_DEF_CANCEL ((WinBits)0x0400) -#define WB_DEF_RETRY ((WinBits)0x0800) -#define WB_DEF_YES ((WinBits)0x1000) -#define WB_DEF_NO ((WinBits)0x2000) - -#define RET_OK TRUE -#define RET_CANCEL FALSE -#define RET_YES 2 -#define RET_NO 3 -#define RET_RETRY 4 +#define WB_OK ((WinBits)0x0010) +#define WB_OK_CANCEL ((WinBits)0x0020) +#define WB_YES_NO ((WinBits)0x0040) +#define WB_YES_NO_CANCEL ((WinBits)0x0080) +#define WB_RETRY_CANCEL ((WinBits)0x0100) + +#define WB_DEF_OK ((WinBits)0x0200) +#define WB_DEF_CANCEL ((WinBits)0x0400) +#define WB_DEF_RETRY ((WinBits)0x0800) +#define WB_DEF_YES ((WinBits)0x1000) +#define WB_DEF_NO ((WinBits)0x2000) + +#define RET_OK TRUE +#define RET_CANCEL FALSE +#define RET_YES 2 +#define RET_NO 3 +#define RET_RETRY 4 */ } @@ -188,7 +188,7 @@ void MyApp::Property( ApplicationProperty& rProp ) pTTProperties->nPropertyVersion = TT_PROPERTIES_VERSION; switch ( pTTProperties->nActualPR ) { -/* case TT_PR_SLOTS: +/* case TT_PR_SLOTS: { pTTProperties->nSidOpenUrl = SID_OPENURL; pTTProperties->nSidFileName = SID_FILE_NAME; @@ -218,7 +218,7 @@ void MyApp::Property( ApplicationProperty& rProp ) } } break; -/* case TT_PR_IMG: +/* case TT_PR_IMG: { SvDataMemberObjectRef aDataObject = new SvDataMemberObject(); SvData* pDataBmp = new SvData( FORMAT_BITMAP ); @@ -245,11 +245,11 @@ USHORT MyDispatcher::ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs, USHORT switch (nSID) { - case IDM_FILE_EXIT: pMainWin->FileExit(); break; - case IDM_FILE_OPEN_TEST: pMainWin->FileOpen(); break; - case IDM_TEST_GROSS: pMainWin->TestGross(); break; - case IDM_TEST_WINTREE: pMainWin->WinTree(); break; - case IDM_SYS_DLG: pMainWin->SysDlg(); break; + case IDM_FILE_EXIT: pMainWin->FileExit(); break; + case IDM_FILE_OPEN_TEST: pMainWin->FileOpen(); break; + case IDM_TEST_GROSS: pMainWin->TestGross(); break; + case IDM_TEST_WINTREE: pMainWin->WinTree(); break; + case IDM_SYS_DLG: pMainWin->SysDlg(); break; default: { DBG_ERROR1("Dispatcher kennt Funktion nicht %s",ByteString::CreateFromInt64(nSID).GetBuffer()); @@ -274,7 +274,7 @@ Reference< XContentProviderManager > InitializeUCB( void ) exit( 1 ); } OSL_ASSERT( path.lastIndexOf( '/' ) >= 0 ); - + ::rtl::OUStringBuffer bufServices( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); bufServices.appendAscii("services.rdb"); @@ -283,8 +283,8 @@ Reference< XContentProviderManager > InitializeUCB( void ) ::rtl::OUStringBuffer bufTypes( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); bufTypes.appendAscii("types.rdb"); OUString types = bufTypes.makeStringAndClear(); - - + + Reference< XMultiServiceFactory > xSMgr; try { @@ -297,7 +297,7 @@ Reference< XContentProviderManager > InitializeUCB( void ) InfoBox( NULL, String( exc.Message ) ).Execute(); throw ; } - + ////////////////////////////////////////////////////////////////////// // set global factory diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx index bc06f0bd9dce..60a66d8a0607 100644 --- a/automation/source/miniapp/testapp.hxx +++ b/automation/source/miniapp/testapp.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 @@ -44,10 +44,10 @@ #include "editwin.hxx" -#define EXECUTE_NO 0 +#define EXECUTE_NO 0 #define EXECUTE_POSSIBLE 1 #define EXECUTE_YES 2 -#define EXECUTEMODE_ASYNCHRON 1 +#define EXECUTEMODE_ASYNCHRON 1 #define EXECUTEMODE_DIALOGASYNCHRON 2 @@ -81,7 +81,7 @@ public: virtual void SetExecuteMode( USHORT nMode ) { (void) nMode; /* avoid warning about unused parameter */ - }; // Ist hier sowieso egal + }; // Ist hier sowieso egal }; class MyApp : public Application @@ -94,8 +94,8 @@ public: MyApp(); void Main(); - virtual void Property( ApplicationProperty& ); - virtual PlugInDispatcher* GetDispatcher(); + virtual void Property( ApplicationProperty& ); + virtual PlugInDispatcher* GetDispatcher(); MainWindow *pMainWin; }; diff --git a/automation/source/mozillaserver/mozillatesttoolserver.idl b/automation/source/mozillaserver/mozillatesttoolserver.idl index 5b5b5acc1e16..365354ae3b66 100644 --- a/automation/source/mozillaserver/mozillatesttoolserver.idl +++ b/automation/source/mozillaserver/mozillatesttoolserver.idl @@ -1,7 +1,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 @@ -31,7 +31,7 @@ //============================================================================= -module com { module sun { module star { module testtool { +module com { module sun { module star { module testtool { //============================================================================= /** @@ -47,6 +47,6 @@ service MozillaTesttoolServer //============================================================================= -}; }; }; }; +}; }; }; }; #endif diff --git a/automation/source/mozillaserver/xmozillatesttoolserver.idl b/automation/source/mozillaserver/xmozillatesttoolserver.idl index 51755a67a35d..a1c6b83a5f30 100644 --- a/automation/source/mozillaserver/xmozillatesttoolserver.idl +++ b/automation/source/mozillaserver/xmozillatesttoolserver.idl @@ -1,7 +1,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 @@ -33,7 +33,7 @@ //============================================================================= -module com { module sun { module star { module testtool { +module com { module sun { module star { module testtool { //============================================================================= /** Service com.sun.star.devtools.IServerProxy implements this interface. @@ -95,20 +95,20 @@ interface XActionFlow : XAction //============================================================================= -}; }; }; }; +}; }; }; }; //============================================================================= -module com { module sun { module star { module testtool { +module com { module sun { module star { module testtool { -enum ResultType - { - SEQUENCE, /// command with SEQUENCE has been executed - ERROR, /// An error has ocured - RESULT, /// Result of a request - ASSERTION, /// An Assertion has been captured - UI_INFO /// Info about the UserInterfaace +enum ResultType + { + SEQUENCE, /// command with SEQUENCE has been executed + ERROR, /// An error has ocured + RESULT, /// Result of a request + ASSERTION, /// An Assertion has been captured + UI_INFO /// Info about the UserInterfaace }; //============================================================================= @@ -129,11 +129,11 @@ interface XResult : com::sun::star::uno::XInterface //============================================================================= -}; }; }; }; +}; }; }; }; //============================================================================= -module com { module sun { module star { module testtool { +module com { module sun { module star { module testtool { //============================================================================= /** Service com.sun.star.devtools.IServerProxy implements this interface. @@ -145,13 +145,13 @@ interface XMozillaTesttoolServer : com::sun::star::uno::XInterface <BR> */ [oneway] void execute( [in] XAction aAction ); -// sequence < XResult > getResults( [in] boolean bBlock ); /// bBoch = TRUE means to wait for at least 1 result +// sequence < XResult > getResults( [in] boolean bBlock ); /// bBoch = TRUE means to wait for at least 1 result }; //============================================================================= -}; }; }; }; +}; }; }; }; #endif diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx index 0ea7f3c0eb26..cebd1493841a 100644 --- a/automation/source/server/XMLParser.cxx +++ b/automation/source/server/XMLParser.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 @@ -357,7 +357,7 @@ void SAXParser::startElement( const ::rtl::OUString& aName, const ::com::sun::st void SAXParser::endElement( const ::rtl::OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) { - (void) aName; /* avoid warning about unused parameter */ + (void) aName; /* avoid warning about unused parameter */ xCurrentNode = xCurrentNode->GetParent(); } @@ -381,18 +381,18 @@ void SAXParser::characters( const ::rtl::OUString& aChars ) throw (::com::sun::s void SAXParser::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) { - (void) aWhitespaces; /* avoid warning about unused parameter */ + (void) aWhitespaces; /* avoid warning about unused parameter */ } void SAXParser::processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) { - (void) aTarget; /* avoid warning about unused parameter */ - (void) aData; /* avoid warning about unused parameter */ + (void) aTarget; /* avoid warning about unused parameter */ + (void) aData; /* avoid warning about unused parameter */ } void SAXParser::setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) { - (void) xLocator; /* avoid warning about unused parameter */ + (void) xLocator; /* avoid warning about unused parameter */ #if OSL_DEBUG_LEVEL > 1 ::rtl::OUString aTester; aTester = xLocator->getPublicId(); diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 1e670a6e4d6a..a4e62f44b745 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.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 @@ -31,9 +31,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! * ************************************************************************/ #include <osl/endian.h> @@ -62,7 +62,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_ULONG nUId ) Write(comm_USHORT(SIReturn)); Write(nRet); Write(nUId); - Write(comm_USHORT(PARAM_NONE)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_NONE)); // Typ der folgenden Parameter } void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ) @@ -70,7 +70,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ) Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nNr); } @@ -79,7 +79,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pSt Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter Write(pString); } @@ -88,7 +88,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter Write(bBool); } @@ -97,7 +97,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter Write(nNr); Write(pString); Write(bBool); @@ -109,7 +109,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter Write(nMethod); } @@ -118,7 +118,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1)); // Typ der folgenden Parameter Write(nMethod); Write(pString); } @@ -128,7 +128,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter Write(nMethod); Write(pString); Write(bBool); @@ -139,7 +139,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_USHORT_1|PARAM_BOOL_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_USHORT_1|PARAM_BOOL_1)); // Typ der folgenden Parameter Write(nMethod); Write(bBool); } @@ -149,7 +149,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(comm_USHORT(SIReturn)); Write(nRet); Write(pUId); - Write(comm_USHORT(PARAM_USHORT_1|PARAM_ULONG_1)); // Typ der folgenden Parameter + Write(comm_USHORT(PARAM_USHORT_1|PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nMethod); Write(nNr); } @@ -185,7 +185,7 @@ void CmdBaseStream::Read (comm_UniChar* &aString, comm_USHORT &nLenInChars ) #ifdef DBG_UTIL if (nId != BinString) DBG_ERROR1( "Falscher Typ im Stream: Erwartet String, gefunden :%hu", nId ); #endif - + *pCommStream >> nLenInChars; aString = new comm_UniChar [nLenInChars]; @@ -235,7 +235,7 @@ void CmdBaseStream::Write( const comm_UniChar* aString, comm_USHORT nLenInChars comm_USHORT n; - // remove BiDi and zero-width-markers 0x200B - 0x200F + // remove BiDi and zero-width-markers 0x200B - 0x200F // remove BiDi and paragraph-markers 0x2028 - 0x202E comm_UniChar* aNoBiDiString; @@ -280,23 +280,23 @@ void CmdBaseStream::Write( comm_BOOL bBool ) void CmdBaseStream::Read ( comm_String* &pString ) { - (void) pString; /* avoid warning about unused parameter */ + (void) pString; /* avoid warning about unused parameter */ DBG_ERROR("Read ( comm_String* &pString ) Not Implemented"); } void CmdBaseStream::Read ( SmartId* &pId ) -{ - (void) pId; /* avoid warning about unused parameter */ +{ + (void) pId; /* avoid warning about unused parameter */ DBG_ERROR("Read ( SmartId* &pId ) Not Implemented"); } void CmdBaseStream::Write( comm_String *pString ) { - (void) pString; /* avoid warning about unused parameter */ + (void) pString; /* avoid warning about unused parameter */ DBG_ERROR("Write( comm_String *pString ) Not Implemented"); } void CmdBaseStream::Write( SmartId* pId ) { - (void) pId; /* avoid warning about unused parameter */ + (void) pId; /* avoid warning about unused parameter */ DBG_ERROR("Write( SmartId* pId ) Not Implemented"); } diff --git a/automation/source/server/editwin.cxx b/automation/source/server/editwin.cxx index 5d3e1502b187..4880772e77dc 100644 --- a/automation/source/server/editwin.cxx +++ b/automation/source/server/editwin.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 @@ -37,7 +37,7 @@ class ImpWorkWindow : public WorkWindow { public: - MultiLineEdit m_aInhalt; + MultiLineEdit m_aInhalt; ImpWorkWindow( WorkWindow *pParent, const UniString &rName, WinBits ); ~ImpWorkWindow(); void Resize(); @@ -146,7 +146,7 @@ void EditWindow::AddText( const String &rNew ) if ( nTextLen > 5000 ) { pImpWorkWindow->m_aInhalt.SetText( pImpWorkWindow->m_aInhalt.GetText().Erase(0,1000) ); - nTextLen = pImpWorkWindow->m_aInhalt.GetText().Len(); // Absolut, um Fehler sonstwo auszubügeln + nTextLen = pImpWorkWindow->m_aInhalt.GetText().Len(); // Absolut, um Fehler sonstwo auszubügeln } diff --git a/automation/source/server/editwin.hxx b/automation/source/server/editwin.hxx index d01a824c3bdd..23d13eb9815c 100644 --- a/automation/source/server/editwin.hxx +++ b/automation/source/server/editwin.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 @@ -39,17 +39,17 @@ class ImpWorkWindow; class EditWindow { protected: - ImpWorkWindow *pImpWorkWindow; + ImpWorkWindow *pImpWorkWindow; BOOL check(); - WorkWindow *pMemParent; - String aMemName; - WinBits iMemWstyle; + WorkWindow *pMemParent; + String aMemName; + WinBits iMemWstyle; - String aMemPreWinText; - BOOL bShowWin; + String aMemPreWinText; + BOOL bShowWin; - xub_StrLen nTextLen; // aus Performanzgründen eigene Länge mitführen + xub_StrLen nTextLen; // aus Performanzgründen eigene Länge mitführen public: EditWindow( WorkWindow *pParent, const UniString &rName = UniString( RTL_CONSTASCII_USTRINGPARAM ( "Debug" ) ), WinBits iWstyle = WB_HSCROLL | WB_VSCROLL ); diff --git a/automation/source/server/prof_nul.cxx b/automation/source/server/prof_nul.cxx index 3fb9d92a7597..dc177a59e60e 100644 --- a/automation/source/server/prof_nul.cxx +++ b/automation/source/server/prof_nul.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 @@ -48,7 +48,7 @@ struct SysdepStaticData void TTProfiler::InitSysdepProfiler() { - if ( !pSysDepStatic ) // Sollte immer so sein!! + if ( !pSysDepStatic ) // Sollte immer so sein!! pSysDepStatic = new SysdepStaticData; // Hier initialisieren @@ -56,7 +56,7 @@ void TTProfiler::InitSysdepProfiler() void TTProfiler::DeinitSysdepProfiler() { - if ( pSysDepStatic ) // Sollte immer so sein!! + if ( pSysDepStatic ) // Sollte immer so sein!! { // Hier aufräumen und eventuell Speicher freigeben diff --git a/automation/source/server/prof_usl.cxx b/automation/source/server/prof_usl.cxx index a20e81606d7b..21086c48b0b9 100644 --- a/automation/source/server/prof_usl.cxx +++ b/automation/source/server/prof_usl.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 @@ -51,7 +51,7 @@ struct SysdepStaticData void TTProfiler::InitSysdepProfiler() { - if ( !pSysDepStatic ) // Sollte immer so sein!! + if ( !pSysDepStatic ) // Sollte immer so sein!! pSysDepStatic = new SysdepStaticData; // Hier initialisieren @@ -59,7 +59,7 @@ void TTProfiler::InitSysdepProfiler() void TTProfiler::DeinitSysdepProfiler() { - if ( pSysDepStatic ) // Sollte immer so sein!! + if ( pSysDepStatic ) // Sollte immer so sein!! { // Hier aufräumen und eventuell Speicher freigeben @@ -88,19 +88,19 @@ String TTProfiler::GetSysdepProfileHeader() // Zustand merken void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, USHORT ) { - SvFileStream aStream( String::CreateFromAscii("/proc/self/psinfo"), STREAM_READ ); // Das ist ein expliziter Pfad für UNXSOL! + SvFileStream aStream( String::CreateFromAscii("/proc/self/psinfo"), STREAM_READ ); // Das ist ein expliziter Pfad für UNXSOL! if ( aStream.IsOpen() ) { aStream.Read( &(pSysdepProfileSnapshot->mpsinfo), sizeof( psinfo ) ); aStream.Close(); } - SvFileStream anotherStream( String::CreateFromAscii("/proc/self/status"), STREAM_READ ); // Das ist ein expliziter Pfad für UNXSOL! + SvFileStream anotherStream( String::CreateFromAscii("/proc/self/status"), STREAM_READ ); // Das ist ein expliziter Pfad für UNXSOL! if ( anotherStream.IsOpen() ) { anotherStream.Read( &(pSysdepProfileSnapshot->mpstatus), sizeof( pstatus ) ); anotherStream.Close(); } - SvFileStream YetAnotherStream( String::CreateFromAscii("/proc/self/usage"), STREAM_READ ); // Das ist ein expliziter Pfad für UNXSOL! + SvFileStream YetAnotherStream( String::CreateFromAscii("/proc/self/usage"), STREAM_READ ); // Das ist ein expliziter Pfad für UNXSOL! if ( YetAnotherStream.IsOpen() ) { YetAnotherStream.Read( &(pSysdepProfileSnapshot->mprusage), sizeof( prusage ) ); @@ -122,10 +122,10 @@ String TTProfiler::GetSysdepProfileLine( SysdepProfileSnapshot *pStart, SysdepPr aProfile += Pad( String::CreateFromInt64(DIFF_MS( pStart, pStop, mprusage.pr_rtime ) / AVER( pStart, pStop, mprusage.pr_count )), 7 ); - + ULONG d_utime = DIFF_MS( pStart, pStop, mpstatus.pr_utime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cutime ); ULONG d_stime = DIFF_MS( pStart, pStop, mpstatus.pr_stime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cstime ); - + aProfile += Pad( String::CreateFromInt64(d_utime), 7 ); aProfile += Pad( String::CreateFromInt64(d_stime), 7 ); aProfile += Pad( String::CreateFromInt64(d_utime + d_stime), 7 ); diff --git a/automation/source/server/profiler.cxx b/automation/source/server/profiler.cxx index 95d7c00a6b7e..595f4acbede6 100644 --- a/automation/source/server/profiler.cxx +++ b/automation/source/server/profiler.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 @@ -158,7 +158,7 @@ void TTProfiler::GetProfileSnapshot( ProfileSnapshot *pProfileSnapshot ) } -void TTProfiler::StartProfilingPerCommand() // Jeden Befehl mitschneiden +void TTProfiler::StartProfilingPerCommand() // Jeden Befehl mitschneiden { bIsProfilingPerCommand = TRUE; } @@ -214,11 +214,11 @@ void TTProfiler::Timeout() aAutoProfileBuffer += aLine; - ProfileSnapshot *pTemp = pAutoStart; // Tauschen, so daß jetziges Ende nächsten Start wird + ProfileSnapshot *pTemp = pAutoStart; // Tauschen, so daß jetziges Ende nächsten Start wird pAutoStart = pAutoEnd; pAutoEnd = pTemp; - Start(); // Timer neu starten + Start(); // Timer neu starten } String TTProfiler::GetAutoProfiling() diff --git a/automation/source/server/profiler.hxx b/automation/source/server/profiler.hxx index c7d0537d6225..bc994434eec1 100644 --- a/automation/source/server/profiler.hxx +++ b/automation/source/server/profiler.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 @@ -37,12 +37,12 @@ #include <tools/string.hxx> #include <vcl/timer.hxx> -#define PROFILE_START 0x01 -#define PROFILE_END 0x02 +#define PROFILE_START 0x01 +#define PROFILE_END 0x02 struct SysdepProfileSnapshot; -struct SysdepStaticData; // Nicht wirklich statisch, sondern statisch über mehrere Snapshots +struct SysdepStaticData; // Nicht wirklich statisch, sondern statisch über mehrere Snapshots struct ProfileSnapshot { @@ -59,13 +59,13 @@ public: TTProfiler(); ~TTProfiler(); - String GetProfileHeader(); // Titelzeile für Logdatei - void StartProfileInterval( BOOL bReadAnyway = FALSE ); // Zustand merken - void EndProfileInterval(); // Informationszeile zusammenbauen + String GetProfileHeader(); // Titelzeile für Logdatei + void StartProfileInterval( BOOL bReadAnyway = FALSE ); // Zustand merken + void EndProfileInterval(); // Informationszeile zusammenbauen String GetProfileLine( String &aPrefix ); - void StartProfilingPerCommand(); // Jeden Befehl mitschneiden + void StartProfilingPerCommand(); // Jeden Befehl mitschneiden void StopProfilingPerCommand(); BOOL IsProfilingPerCommand() { return bIsProfilingPerCommand; } @@ -74,9 +74,9 @@ public: BOOL IsPartitioning() { return bIsPartitioning; } ULONG GetPartitioningTime(); - void StartAutoProfiling( ULONG nMSec ); // Automatisch alle nMSec Milisekunden sampeln - String GetAutoProfiling(); // Aktuelle `Sammlung` abholen - void StopAutoProfiling(); // Sampeln beenden + void StartAutoProfiling( ULONG nMSec ); // Automatisch alle nMSec Milisekunden sampeln + String GetAutoProfiling(); // Aktuelle `Sammlung` abholen + void StopAutoProfiling(); // Sampeln beenden BOOL IsAutoProfiling() { return bIsAutoProfiling; } private: @@ -98,7 +98,7 @@ private: BOOL bIsPartitioning; -// Für das Automatische Profiling in festen Intervallen +// Für das Automatische Profiling in festen Intervallen ProfileSnapshot *pAutoStart; ProfileSnapshot *pAutoEnd; @@ -110,11 +110,11 @@ private: // Einige Hilfsfunktionen -// String Hex( ULONG nNr ); - String Dec( ULONG nNr ); // Ergebnis = nNr / 100 mit 2 Dezimalen - String Pad( const String aS, xub_StrLen nLen ); // Fügt blanks links an den String an +// String Hex( ULONG nNr ); + String Dec( ULONG nNr ); // Ergebnis = nNr / 100 mit 2 Dezimalen + String Pad( const String aS, xub_StrLen nLen ); // Fügt blanks links an den String an -/* Ab hier werden die Methoden Systemabhängig in den entsprechenden cxx implementiert +/* Ab hier werden die Methoden Systemabhängig in den entsprechenden cxx implementiert Sie werden von den oberen Methoden gerufen. */ diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx index ba730491f672..6c9cabbef477 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.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 @@ -154,7 +154,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // or ( new_window and new_window_is_interesting ) ( ignore interesting events to uninteresting window ) if ( aKeyString.Len() - && ( ( nEventID != VCLEVENT_WINDOW_KEYINPUT + && ( ( nEventID != VCLEVENT_WINDOW_KEYINPUT && nEventID != VCLEVENT_WINDOW_MOUSEMOVE && nEventID != VCLEVENT_WINDOW_COMMAND && nEventID != VCLEVENT_WINDOW_KEYUP ) @@ -431,7 +431,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } } break; -/* case C_MoreButton: +/* case C_MoreButton: switch( nEventID ) { case M_IsOpen : @@ -563,16 +563,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // if ( pActionParent != pWin ) // { // it IS a tearoff not an undock // // compare to 1 for floating ToolBoxes -// if ( m_bRecord ) -// { -// if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) ) -// // generate direct Button access -// StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) ); -// else -// // access via Toolbox -// StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit -// bSendData = TRUE; -// } +// if ( m_bRecord ) +// { +// if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) ) +// // generate direct Button access +// StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) ); +// else +// // access via Toolbox +// StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit +// bSendData = TRUE; +// } // if ( m_bLog ) // { // LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") ); @@ -587,11 +587,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } } break; -/* ToolBox *pTB = ((ToolBox*)pControl); - if ( pTB->GetUniqueOrHelpId() != nUId ) // Also Button auf der ToolBox gefunden +/* ToolBox *pTB = ((ToolBox*)pControl); + if ( pTB->GetUniqueOrHelpId() != nUId ) // Also Button auf der ToolBox gefunden { if ( nParams == PARAM_NONE ) - { // Wir fälschen einen Parameter + { // Wir fälschen einen Parameter nParams = PARAM_USHORT_1; nNr1 = nUId; } @@ -725,11 +725,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case WINDOW_DOCKINGWINDOW: // switch( nEventID ) { -// case 1 .. 0xffff: +// case 1 .. 0xffff: DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin ); -// BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode(); -// break; -/* case M_Dock : +// BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode(); +// break; +/* case M_Dock : if ( ((DockingWindow*)pControl)->IsFloatingMode() ) ((DockingWindow*)pControl)->SetFloatingMode(FALSE); else @@ -763,7 +763,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) else ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_DOCKING_MODE, MethodString( nMethodId ) ) ); break; - case M_Help: // Alles was unten weiterbehandelt werden soll + case M_Help: // Alles was unten weiterbehandelt werden soll goto MoreDialog; default: @@ -781,7 +781,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin ); // FloatingWindow *pFW = ((FloatingWindow*)pWin); -/* switch( nEventID ) +/* switch( nEventID ) { // M_OpenMenu an einem ToolboxButton @@ -798,7 +798,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) bSendData = TRUE; } break; - + } */ } break; @@ -831,7 +831,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) SET_WINP_CLOSING(pControl); ((FloatingWindow*)pControl)->Close(); break; - case M_Help: // Alles was unten weiterbehandelt werden soll + case M_Help: // Alles was unten weiterbehandelt werden soll case M_Move: goto MoreDialog; default: @@ -901,7 +901,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case M_Move: goto FloatWin; break; - case M_Help: // Alles was unten weiterbehandelt werden soll + case M_Help: // Alles was unten weiterbehandelt werden soll goto MoreDialog; default: ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "WorkWindow" ) ); @@ -911,7 +911,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) */ -/* case C_TabPage: +/* case C_TabPage: switch( nEventID ) { } @@ -964,7 +964,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) break; } if ( bDone ) - break; // break the case here else continue at C_ButtonDialog + break; // break the case here else continue at C_ButtonDialog } case C_ButtonDialog: { @@ -1048,7 +1048,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) if ( bSendData ) - new StatementFlow( NULL, F_EndCommandBlock ); // Kommando zum Senden erzeugen und in que eintragen + new StatementFlow( NULL, F_EndCommandBlock ); // Kommando zum Senden erzeugen und in que eintragen return 0; } diff --git a/automation/source/server/recorder.hxx b/automation/source/server/recorder.hxx index fff786d1484d..362fc706c95f 100644 --- a/automation/source/server/recorder.hxx +++ b/automation/source/server/recorder.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 @@ -68,7 +68,7 @@ private: MacroRecorder(); ~MacroRecorder(); - void CheckDelete(); + void CheckDelete(); // Actions to perform BOOL m_bRecord; diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 1e89d1826ddd..cd434a39a39c 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.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 @@ -39,7 +39,7 @@ RetStream::RetStream() { pSammel = new SvMemoryStream(); pCommStream = new SvCommStream( pSammel ); -// SetCommStream( pCommStream ); +// SetCommStream( pCommStream ); } RetStream::~RetStream() @@ -63,7 +63,7 @@ void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue ) Write(USHORT(SIReturn)); Write(nRet); Write(&aUId); - Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter + Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter Write(aValue); } @@ -118,7 +118,7 @@ void RetStream::Reset () delete pSammel; pSammel = new SvMemoryStream(); pCommStream = new SvCommStream( pSammel ); -// SetCommStream( pCommStream ); +// SetCommStream( pCommStream ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index ed620a4f6751..14440bb12f36 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.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/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx index 977236cc5a3f..af88f9b65162 100644 --- a/automation/source/server/scmdstrm.cxx +++ b/automation/source/server/scmdstrm.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 @@ -44,7 +44,7 @@ SCmdStream::SCmdStream(SvStream *pIn) { pSammel = pIn; pCommStream = new SvCommStream( pSammel ); -// SetCommStream( pCommStream ); +// SetCommStream( pCommStream ); } SCmdStream::~SCmdStream() diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx index d578909ad3ab..f6ca2a60cc6c 100644 --- a/automation/source/server/scmdstrm.hxx +++ b/automation/source/server/scmdstrm.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 @@ -49,7 +49,7 @@ public: using CmdBaseStream::Read; void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );} void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );} -// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );} +// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );} void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );} // new void Read ( String &aString ); diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 66f6f95ae783..d1633047ab28 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.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 @@ -108,7 +108,7 @@ RemoteControlCommunicationManager::RemoteControlCommunicationManager() { SetInfoType( CM_SHORT_TEXT | CM_ALL ); ByteString aByteString; - InfoMsg( InfoString( aByteString, CM_ALL ) ); // Anzeigen, daß wir da sind + InfoMsg( InfoString( aByteString, CM_ALL ) ); // Anzeigen, daß wir da sind } } @@ -148,8 +148,8 @@ IMPL_LINK( RemoteControlCommunicationManager, SetWinCaption, Timer*, EMPTYARG ) StatementList::GetFirstDocFrame()->SetText(String(aOriginalWinCaption).AppendAscii(" TT").Append(aAdditionalWinCaption).AppendAscii("[").Append(UniString::CreateFromInt32(nPortToListen)).AppendAscii("]")); } else - { // Dann Probieren wir es eben in 1 Sekunde nochmal - pTimer = new Timer(); // Wird im Link gelöscht + { // Dann Probieren wir es eben in 1 Sekunde nochmal + pTimer = new Timer(); // Wird im Link gelöscht pTimer->SetTimeout( 1000 ); pTimer->SetTimeoutHdl( LINK( this, RemoteControlCommunicationManager, SetWinCaption ) ); pTimer->Start(); @@ -172,7 +172,7 @@ void RemoteControlCommunicationManager::InfoMsg( InfoString aMsg ) ULONG RemoteControlCommunicationManager::GetPort() { if ( TT_PORT_NOT_INITIALIZED == nPortIs ) - { // Read Config + { // Read Config USHORT i; // are we to be automated at all? @@ -239,9 +239,9 @@ ULONG RemoteControlCommunicationManager::GetPort() } #if OSL_DEBUG_LEVEL > 1 -#define MIN_IDLE 10000 // Ruhe vor dem Sturm min 10 Sekunden +#define MIN_IDLE 10000 // Ruhe vor dem Sturm min 10 Sekunden #else -#define MIN_IDLE 60000 // Ruhe vor dem Sturm min 1 Minuten +#define MIN_IDLE 60000 // Ruhe vor dem Sturm min 1 Minuten #endif class ExtraIdle : public AutoTimer @@ -259,9 +259,9 @@ ExtraIdle::ExtraIdle( ImplRemoteControl *pRC ) : nStep( 0 ) , pRemoteControl (pRC ) { - SetTimeout( 120000 ); // 2 Minuten + SetTimeout( 120000 ); // 2 Minuten #if OSL_DEBUG_LEVEL > 1 - SetTimeout( 40000 ); // 40 Sekunden + SetTimeout( 40000 ); // 40 Sekunden #endif Start(); } @@ -286,7 +286,7 @@ void ExtraIdle::Timeout() if ( Application::IsInModalMode() || Application::GetLastInputInterval() < MIN_IDLE ) #endif { - if ( nStep ) // Schon angefangen? dann abbrechen, sonst später nochmal + if ( nStep ) // Schon angefangen? dann abbrechen, sonst später nochmal { if ( nStep < 15 ) { @@ -307,14 +307,14 @@ void ExtraIdle::Timeout() return; } - if ( StatementList::pFirst ) // Verarbeitung neu aufsetzen + if ( StatementList::pFirst ) // Verarbeitung neu aufsetzen { GetpApp()->PostUserEvent( LINK( pRemoteControl, ImplRemoteControl, CommandHdl ) ); return; } - switch ( nStep++ ) // Probieren ob wir noch was machen können + switch ( nStep++ ) // Probieren ob wir noch was machen können { case 0: { @@ -360,7 +360,7 @@ void ExtraIdle::Timeout() "YEZO\n" "ob\n" "UmRo`\n" - "5J~O2o5+90~5,6xW$+5:c9o0UXRm`Y UQ~JP~X]`Y\\|%Y`Yo]~O||2[pP0Y1J,|V),,7:,+|JS+U*[/O|K\n" + "5J~O2o5+90~5,6xW$+5:c9o0UXRm`Y UQ~JP~X]`Y\\|%Y`Yo]~O||2[pP0Y1J,|V),,7:,+|JS+U*[/O|K\n" "|KaLYNV~]]2W/]*Y9|`*Y,P=[5P|U\n" "]}mqbw`zZU\\L\n" "LZdYWo9\n" @@ -373,7 +373,7 @@ void ExtraIdle::Timeout() "++2\\5&K|~5n9r~9/*9<*~051*Q|0~0rY|~./97~Q*7,Z9<|KY0:=K*<=w~qY`IbOKzLwN,`7b,V~]E`]b\\ORE~\n" "\n" "Vq~bR`W;a+Y\\J=LKJa+W*I/PbR~JLUX[|b~`Z2P/R*[9a~W=9~/9p8=a*P=J0OZ~7L`JbL=P<WbaLQbPO]JYKbD\n" - "aY`J5J:b~7=2~+9)9W1,50b9X3P0`YbYVJ`Jb \\`Z]`Vb\n" + "aY`J5J:b~7=2~+9)9W1,50b9X3P0`YbYVJ`Jb \\`Z]`Vb\n" "VRQJ`b" ; #endif @@ -486,7 +486,7 @@ void ExtraIdle::Timeout() //#if OSL_DEBUG_LEVEL > 1 -// SvFileStream aStream( "d:\\gh_writeback.jpg" , STREAM_STD_READWRITE | STREAM_TRUNC ); +// SvFileStream aStream( "d:\\gh_writeback.jpg" , STREAM_STD_READWRITE | STREAM_TRUNC ); //#else SvMemoryStream aStream; //#endif @@ -530,10 +530,10 @@ void ExtraIdle::Timeout() } /*********************************************************************** -// USHORT nBC = pBmp->GetBitCount(); -// pBmp->Scale( 0.02, 0.02 ); -// nBC = pBmp->GetBitCount(); -// SvMemoryStream aStream; +// USHORT nBC = pBmp->GetBitCount(); +// pBmp->Scale( 0.02, 0.02 ); +// nBC = pBmp->GetBitCount(); +// SvMemoryStream aStream; SvFileStream aStream( "d:\gh_small50.jpg", STREAM_STD_READ ); aStream.Seek( 0 ); @@ -544,7 +544,7 @@ void ExtraIdle::Timeout() aStream >> c; while ( !aStream.IsEof() ) { - cRest <<= 2; // Im ersten Durchgang egal, da immer 0 + cRest <<= 2; // Im ersten Durchgang egal, da immer 0 cRest |= ( c & 0x03 ); c >>= 2; aDreierGruppe += aTr.GetChar( c ); @@ -571,7 +571,7 @@ void ExtraIdle::Timeout() } case 7: { - new StatementSlot( 20384 ); // FN_TOOL_ANKER_CHAR aus SW? + new StatementSlot( 20384 ); // FN_TOOL_ANKER_CHAR aus SW? return; } } @@ -605,7 +605,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) if ( StatementList::MaybeResetSafeReschedule() ) { - StatementList::bExecuting = FALSE; // Wird nacher im SafeReschedule wieder zurückgesetzt + StatementList::bExecuting = FALSE; // Wird nacher im SafeReschedule wieder zurückgesetzt #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "SafeReschedule has been reset\n" ); #endif @@ -674,7 +674,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) catch( ... ) { if ( !StatementFlow::bUseIPC ) - throw; // aus der Hilfe heraus nicht leise abbrechen + throw; // aus der Hilfe heraus nicht leise abbrechen try { @@ -685,7 +685,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) DBG_ERROR("GPF"); pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) ); StatementList::bDying = TRUE; - while ( StatementList::pFirst ) // Kommandos werden übersprungen + while ( StatementList::pFirst ) // Kommandos werden übersprungen StatementList::NormalReschedule(); delete pDlg; } @@ -876,7 +876,7 @@ ImplRemoteControl::ImplRemoteControl() #endif } if ( RemoteControlCommunicationManager::nComm ) - new ExtraIdle( this ); // Setzt die Bearbeitung wieder auf + new ExtraIdle( this ); // Setzt die Bearbeitung wieder auf } ImplRemoteControl::~ImplRemoteControl() @@ -884,11 +884,11 @@ ImplRemoteControl::~ImplRemoteControl() if ( MacroRecorder::HasMacroRecorder() ) MacroRecorder::GetMacroRecorder()->SetActionRecord( FALSE ); // Will delete MacroRecorder if necessary - + StatementList::bDying = TRUE; #if OSL_DEBUG_LEVEL > 1 if ( m_pDbgWin ) - m_pDbgWin->bQuiet = TRUE; // Keine Ausgabe mehr im Debugwindow + m_pDbgWin->bQuiet = TRUE; // Keine Ausgabe mehr im Debugwindow #endif #ifdef DBG_UTIL @@ -898,10 +898,10 @@ ImplRemoteControl::~ImplRemoteControl() #endif if ( StatementList::pFirst ) - { // Es sind noch Kommandos da, also auch eine Möglichkeit zurückzusenden. + { // Es sind noch Kommandos da, also auch eine Möglichkeit zurückzusenden. StatementList::pFirst->ReportError( GEN_RES_STR0( S_APP_SHUTDOWN ) ); - while ( StatementList::pFirst ) // Kommandos werden übersprungen - StatementList::NormalReschedule(); // Fehler zurückgeschickt + while ( StatementList::pFirst ) // Kommandos werden übersprungen + StatementList::NormalReschedule(); // Fehler zurückgeschickt } if ( pServiceMgr ) diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx index e07ad2b0f6e4..96294db704b2 100644 --- a/automation/source/server/server.hxx +++ b/automation/source/server/server.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 @@ -31,8 +31,8 @@ #include "editwin.hxx" #include <automation/communi.hxx> -#define TT_PORT_NOT_INITIALIZED ULONG(0xFFFFFFFF) // Eigentlich ja noch mehr, aber soll mal reichen -#define TT_NO_PORT_DEFINED 0 +#define TT_PORT_NOT_INITIALIZED ULONG(0xFFFFFFFF) // Eigentlich ja noch mehr, aber soll mal reichen +#define TT_NO_PORT_DEFINED 0 class RemoteControlCommunicationManager : public CommunicationManagerServerViaSocket { @@ -63,7 +63,7 @@ public: static USHORT nComm; #if OSL_DEBUG_LEVEL > 1 -// virtual void DataReceived( CommunicationLink* pCL ); +// virtual void DataReceived( CommunicationLink* pCL ); #endif }; diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index 756cfa980114..cfc0266fb571 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.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 @@ -81,13 +81,13 @@ SmartId StatementList::aWindowWaitOldHelpId = SmartId(); SmartId StatementList::aWindowWaitOldUniqueId = SmartId(); USHORT StatementList::nUseBindings = 0; -SmartId StatementList::aSubMenuId1 = SmartId(); // Untermenüs bei PopupMenus -SmartId StatementList::aSubMenuId2 = SmartId(); // erstmal 2-Stufig -SmartId StatementList::aSubMenuId3 = SmartId(); // and now even 3 levels #i31512# +SmartId StatementList::aSubMenuId1 = SmartId(); // Untermenüs bei PopupMenus +SmartId StatementList::aSubMenuId2 = SmartId(); // erstmal 2-Stufig +SmartId StatementList::aSubMenuId3 = SmartId(); // and now even 3 levels #i31512# SystemWindow *StatementList::pMenuWindow = NULL; TTProperties *StatementList::pTTProperties = NULL; -USHORT StatementList::nMinTypeKeysDelay = 0; // Verzögerung der einzelnen Anschläge für TypeKeys +USHORT StatementList::nMinTypeKeysDelay = 0; // Verzögerung der einzelnen Anschläge für TypeKeys USHORT StatementList::nMaxTypeKeysDelay = 0; BOOL StatementList::bDoTypeKeysDelay = FALSE; @@ -140,7 +140,7 @@ StatementList::StatementList() , bStatementInQue(FALSE) { if (!pRet) - pRet = new RetStream; // so Spät wie möglich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist. + pRet = new RetStream; // so Spät wie möglich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist. } void StatementList::InitProfile() @@ -205,7 +205,7 @@ void StatementList::QueStatement(StatementList *pAfterThis) pFirst = this; } } - else // am Ende einfügen + else // am Ende einfügen { pNext = NULL; if( !pFirst ) @@ -222,7 +222,7 @@ void StatementList::QueStatement(StatementList *pAfterThis) } void StatementList::Advance() -{ // pFirst ist static! +{ // pFirst ist static! pFirst = pNext; bStatementInQue = FALSE; pNext = NULL; @@ -352,7 +352,7 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB return pResult; // if ( pBase->GetType() != WINDOW_BORDERWINDOW ) -// return NULL; +// return NULL; if ( !aSearch.HasSearchFlag( SEARCH_NOOVERLAP ) ) { @@ -398,44 +398,44 @@ BOOL SearchUID::IsWinOK( Window *pWin ) return FALSE; } } - else if ( pWin->GetType() == WINDOW_TOOLBOX ) // Buttons and Controls on ToolBox. + else if ( pWin->GetType() == WINDOW_TOOLBOX ) // Buttons and Controls on ToolBox. { ToolBox *pTB = ((ToolBox*)pWin); USHORT i; for ( i = 0; i < pTB->GetItemCount() ; i++ ) { if ( aUId.Matches( pTB->GetItemCommand(pTB->GetItemId( i )) ) || aUId.Matches( pTB->GetHelpId(pTB->GetItemId( i )) ) ) - { // ID matches. + { // ID matches. Window *pItemWin; pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) ); if ( bSearchButtonOnToolbox && pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && !pItemWin ) - { // We got a Control, see if its valid also. + { // We got a Control, see if its valid also. // Same as above. if ( ( pTB->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pTB->IsVisible() ) - { // We got a Button, see if its valid also. + { // We got a Button, see if its valid also. if ( ( pTB->IsItemEnabled(pTB->GetItemId(i)) || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pTB->IsItemVisible(pTB->GetItemId(i)) ) - return TRUE; // We got a Button. + return TRUE; // We got a Button. else - { // better a disabled Button on a valid ToolBox than an invalid ToolBox as below + { // better a disabled Button on a valid ToolBox than an invalid ToolBox as below pMaybeResult = pTB; return FALSE; } } else if ( !pMaybeResult ) - { // invalid ToolBox + { // invalid ToolBox pMaybeResult = pTB; return FALSE; } } if ( pItemWin ) - { // We got a Control, see if its valid also. + { // We got a Control, see if its valid also. // Same as above. if ( ( pItemWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pItemWin->IsVisible() ) { if ( !pAlternateResult ) // only take the first found ItemWindow #i35365 - pAlternateResult = pItemWin; // since we cannot return a Window here + pAlternateResult = pItemWin; // since we cannot return a Window here return FALSE; // continue searching to prefer a window with the right ID #i32292 } else if ( !pMaybeResult ) @@ -618,7 +618,7 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) BOOL SearchActive::IsWinOK( Window *pWin ) { -// return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ) && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive()); +// return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ) && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive()); // only matches ResID due to problems with UNIX Window Managers return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ); } @@ -1016,7 +1016,7 @@ String StatementList::ClientTree(Window *pBase, int Indent) BOOL StatementList::CheckWindowWait() { - static Time StartTime = Time(0L); // Abbruch wenn Fenster absolut nicht schliesst. + static Time StartTime = Time(0L); // Abbruch wenn Fenster absolut nicht schliesst. if ( StartTime == Time(0L) ) StartTime = Time(); @@ -1033,7 +1033,7 @@ BOOL StatementList::CheckWindowWait() #endif // Ist die Zeit schonn abgelaufen? - if ( StartTime + Time(0,0,10) < Time() ) // 10 Sekunden reichen wohl + if ( StartTime + Time(0,0,10) < Time() ) // 10 Sekunden reichen wohl { #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Close timed out. Going on!! " ); @@ -1082,13 +1082,13 @@ void StatementList::DirectLog( ULONG nType, String aMessage ) } -#define CALL_EVENT_WITH_NOTIFY( EventType, Event, WinP, Method ) \ -{ \ - if ( StatementList::WinPtrValid( WinP ) ) \ +#define CALL_EVENT_WITH_NOTIFY( EventType, Event, WinP, Method ) \ +{ \ + if ( StatementList::WinPtrValid( WinP ) ) \ { \ - NotifyEvent aNEvt( EventType, WinP, &Event ); \ - if ( !WinP->PreNotify( aNEvt ) ) \ - WinP->Method( Event ); \ + NotifyEvent aNEvt( EventType, WinP, &Event ); \ + if ( !WinP->PreNotify( aNEvt ) ) \ + WinP->Method( Event ); \ } \ } @@ -1147,13 +1147,13 @@ void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } else { - // DragManager* pDragManager = DragManager::GetDragManager(); - // if ( pDragManager ) - // pDragManager->MouseMove( aMEvnt, pWin ); - // else + // DragManager* pDragManager = DragManager::GetDragManager(); + // if ( pDragManager ) + // pDragManager->MouseMove( aMEvnt, pWin ); + // else if ( pWin->IsTracking() ) { - TrackingEvent aTEvt( aMEvnt ); + TrackingEvent aTEvt( aMEvnt ); pWin->Tracking( aTEvt ); } else @@ -1191,10 +1191,10 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } else { - // DragManager* pDragManager = DragManager::GetDragManager(); - // if ( pDragManager ) - // pDragManager->ButtonUp( aMEvnt, pWin ); - // else + // DragManager* pDragManager = DragManager::GetDragManager(); + // if ( pDragManager ) + // pDragManager->ButtonUp( aMEvnt, pWin ); + // else if ( pWin->IsTracking() ) { // siehe #64693 die Position ist für Toolboxen relevant @@ -1202,7 +1202,7 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) // Zuerst Tracking beenden ohne Event pWin->EndTracking( ENDTRACK_DONTCALLHDL ); // dann eigenen Event mit richtigem Maus-Event senden - TrackingEvent aTEvt( aMEvnt, ENDTRACK_END ); + TrackingEvent aTEvt( aMEvnt, ENDTRACK_END ); pWin->Tracking( aTEvt ); } else diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 893dbd6710e3..afa4d8b14bb8 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.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 @@ -169,7 +169,7 @@ StatementFlow::StatementFlow( ULONG nServiceId, SCmdStream *pCmdIn, ImplRemoteCo if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nSNr1 ); if( nParams & PARAM_ULONG_1 ) pCmdIn->Read( nLNr1 ); if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 ); - if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 ); // sollte nie auftreten!! + if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 ); // sollte nie auftreten!! #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Reading FlowControl: " ); @@ -196,7 +196,7 @@ void StatementFlow::SendViaSocket() bSending = TRUE; if ( pCommLink ) { - if ( !pCommLink->TransferDataStream( pRet->GetStream() ) ) // tritt ein Fehler auf, so wird sofort gelöscht ... + if ( !pCommLink->TransferDataStream( pRet->GetStream() ) ) // tritt ein Fehler auf, so wird sofort gelöscht ... pCommLink = NULL; } else @@ -225,15 +225,15 @@ BOOL StatementFlow::Execute() if ( !bUseIPC ) { // bBool1 wurde im CTOR auf FALSE initialisiert - if ( !bBool1 ) // also erster Durchlauf + if ( !bBool1 ) // also erster Durchlauf { pRemoteControl->pRetStream = pRet->GetStream(); - bBool1 = TRUE; // wurde im CTOR auf FALSE initialisiert + bBool1 = TRUE; // wurde im CTOR auf FALSE initialisiert nRetryCount = nRetryCount * 4; } - if ( pRemoteControl->pRetStream && (nRetryCount--) ) // also solange nicht abgeholt + if ( pRemoteControl->pRetStream && (nRetryCount--) ) // also solange nicht abgeholt { - return FALSE; // Bitte einmal vom Callstack runter + return FALSE; // Bitte einmal vom Callstack runter } } @@ -246,7 +246,7 @@ BOOL StatementFlow::Execute() { case F_EndCommandBlock: if ( !bUseIPC ) - { // wird oben abgehandelt + { // wird oben abgehandelt pRet->Reset(); IsError = FALSE; } @@ -265,7 +265,7 @@ BOOL StatementFlow::Execute() #endif break; -// case RET_: +// case RET_: default: DBG_ERROR( "Unknown Flowcontrol" ); break; @@ -287,7 +287,7 @@ static short ImpGetRType( Window *pWin, SmartId aUId ) if( (nUId & 0xE0000000) == 0 ) // keine auto ID nRT = C_NoType; else { -// if( (nUId & 0x1F) == 0 ) // globale Resource +// if( (nUId & 0x1F) == 0 ) // globale Resource if( (nUId & 0x1FF) == 0 ) // globale Resource GH: soweit ich das verstanden habe 1FF nRT = (short)(C_TabPage - 1 + (nUId >> 29)); else @@ -307,68 +307,68 @@ static short ImpGetRType( Window *pWin, SmartId aUId ) #endif WindowType eRT = pWin->GetType(); switch( eRT ) { - case WINDOW_WINDOW: nRT = C_Window ; break; - - case WINDOW_TABCONTROL: nRT = C_TabControl ; break; - case WINDOW_RADIOBUTTON: nRT = C_RadioButton ; break; - case WINDOW_CHECKBOX: nRT = C_CheckBox ; break; - case WINDOW_TRISTATEBOX: nRT = C_TriStateBox ; break; - case WINDOW_EDIT: nRT = C_Edit ; break; - case WINDOW_MULTILINEEDIT: nRT = C_MultiLineEdit ; break; - case WINDOW_MULTILISTBOX: nRT = C_MultiListBox ; break; - case WINDOW_LISTBOX: nRT = C_ListBox ; break; - case WINDOW_COMBOBOX: nRT = C_ComboBox ; break; - case WINDOW_PUSHBUTTON: nRT = C_PushButton ; break; - case WINDOW_SPINFIELD: nRT = C_SpinField ; break; - case WINDOW_PATTERNFIELD: nRT = C_PatternField ; break; - case WINDOW_NUMERICFIELD: nRT = C_NumericField ; break; - case WINDOW_METRICFIELD: nRT = C_MetricField ; break; - case WINDOW_CURRENCYFIELD: nRT = C_CurrencyField ; break; - case WINDOW_DATEFIELD: nRT = C_DateField ; break; - case WINDOW_TIMEFIELD: nRT = C_TimeField ; break; - case WINDOW_IMAGERADIOBUTTON: nRT = C_ImageRadioButton ; break; - case WINDOW_NUMERICBOX: nRT = C_NumericBox ; break; - case WINDOW_METRICBOX: nRT = C_MetricBox ; break; - case WINDOW_CURRENCYBOX: nRT = C_CurrencyBox ; break; - case WINDOW_DATEBOX: nRT = C_DateBox ; break; - case WINDOW_TIMEBOX: nRT = C_TimeBox ; break; - case WINDOW_IMAGEBUTTON: nRT = C_ImageButton ; break; - case WINDOW_MENUBUTTON: nRT = C_MenuButton ; break; - case WINDOW_MOREBUTTON: nRT = C_MoreButton ; break; - - - case WINDOW_TABPAGE: nRT = C_TabPage; break; - case WINDOW_MODALDIALOG: nRT = C_ModalDlg; break; - case WINDOW_FLOATINGWINDOW: nRT = C_FloatWin; break; - case WINDOW_MODELESSDIALOG: nRT = C_ModelessDlg; break; - case WINDOW_WORKWINDOW: nRT = C_WorkWin; break; - case WINDOW_DOCKINGWINDOW: nRT = C_DockingWin; break; - - case WINDOW_MESSBOX: nRT = C_MessBox; break; - case WINDOW_INFOBOX: nRT = C_InfoBox; break; - case WINDOW_WARNINGBOX: nRT = C_WarningBox; break; - case WINDOW_ERRORBOX: nRT = C_ErrorBox; break; - case WINDOW_QUERYBOX: nRT = C_QueryBox; break; + case WINDOW_WINDOW: nRT = C_Window ; break; + + case WINDOW_TABCONTROL: nRT = C_TabControl ; break; + case WINDOW_RADIOBUTTON: nRT = C_RadioButton ; break; + case WINDOW_CHECKBOX: nRT = C_CheckBox ; break; + case WINDOW_TRISTATEBOX: nRT = C_TriStateBox ; break; + case WINDOW_EDIT: nRT = C_Edit ; break; + case WINDOW_MULTILINEEDIT: nRT = C_MultiLineEdit ; break; + case WINDOW_MULTILISTBOX: nRT = C_MultiListBox ; break; + case WINDOW_LISTBOX: nRT = C_ListBox ; break; + case WINDOW_COMBOBOX: nRT = C_ComboBox ; break; + case WINDOW_PUSHBUTTON: nRT = C_PushButton ; break; + case WINDOW_SPINFIELD: nRT = C_SpinField ; break; + case WINDOW_PATTERNFIELD: nRT = C_PatternField ; break; + case WINDOW_NUMERICFIELD: nRT = C_NumericField ; break; + case WINDOW_METRICFIELD: nRT = C_MetricField ; break; + case WINDOW_CURRENCYFIELD: nRT = C_CurrencyField ; break; + case WINDOW_DATEFIELD: nRT = C_DateField ; break; + case WINDOW_TIMEFIELD: nRT = C_TimeField ; break; + case WINDOW_IMAGERADIOBUTTON: nRT = C_ImageRadioButton ; break; + case WINDOW_NUMERICBOX: nRT = C_NumericBox ; break; + case WINDOW_METRICBOX: nRT = C_MetricBox ; break; + case WINDOW_CURRENCYBOX: nRT = C_CurrencyBox ; break; + case WINDOW_DATEBOX: nRT = C_DateBox ; break; + case WINDOW_TIMEBOX: nRT = C_TimeBox ; break; + case WINDOW_IMAGEBUTTON: nRT = C_ImageButton ; break; + case WINDOW_MENUBUTTON: nRT = C_MenuButton ; break; + case WINDOW_MOREBUTTON: nRT = C_MoreButton ; break; + + + case WINDOW_TABPAGE: nRT = C_TabPage; break; + case WINDOW_MODALDIALOG: nRT = C_ModalDlg; break; + case WINDOW_FLOATINGWINDOW: nRT = C_FloatWin; break; + case WINDOW_MODELESSDIALOG: nRT = C_ModelessDlg; break; + case WINDOW_WORKWINDOW: nRT = C_WorkWin; break; + case WINDOW_DOCKINGWINDOW: nRT = C_DockingWin; break; + + case WINDOW_MESSBOX: nRT = C_MessBox; break; + case WINDOW_INFOBOX: nRT = C_InfoBox; break; + case WINDOW_WARNINGBOX: nRT = C_WarningBox; break; + case WINDOW_ERRORBOX: nRT = C_ErrorBox; break; + case WINDOW_QUERYBOX: nRT = C_QueryBox; break; #if 0 //ifndef VCL - case WINDOW_FILEDIALOG: nRT = C_FileDlg; break; - case WINDOW_PATHDIALOG: nRT = C_PathDlg; break; - case WINDOW_PRINTDIALOG: nRT = C_PrintDlg; break; - case WINDOW_PRINTERSETUPDIALOG: nRT = C_PrinterSetupDlg;break; - case WINDOW_COLORDIALOG: nRT = C_ColorDlg; break; + case WINDOW_FILEDIALOG: nRT = C_FileDlg; break; + case WINDOW_PATHDIALOG: nRT = C_PathDlg; break; + case WINDOW_PRINTDIALOG: nRT = C_PrintDlg; break; + case WINDOW_PRINTERSETUPDIALOG: nRT = C_PrinterSetupDlg;break; + case WINDOW_COLORDIALOG: nRT = C_ColorDlg; break; #endif - case WINDOW_TABDIALOG: nRT = C_TabDlg; break; -// case WINDOW_TABDIALOG: nRT = C_SingleTabDlg; break; - - case WINDOW_PATTERNBOX: nRT = C_PatternBox; break; - case WINDOW_TOOLBOX: nRT = C_ToolBox; break; -// Gibts nicht case WINDOW_VALUESET: nRT = C_ValueSet; break; - case WINDOW_CONTROL: nRT = C_Control; break; - case WINDOW_OKBUTTON: nRT = C_OkButton; break; - case WINDOW_CANCELBUTTON: nRT = C_CancelButton; break; - case WINDOW_BUTTONDIALOG: nRT = C_ButtonDialog; break; - case WINDOW_TREELISTBOX: nRT = C_TreeListBox; break; - - case WINDOW_DIALOG: nRT = C_Dialog; break; + case WINDOW_TABDIALOG: nRT = C_TabDlg; break; +// case WINDOW_TABDIALOG: nRT = C_SingleTabDlg; break; + + case WINDOW_PATTERNBOX: nRT = C_PatternBox; break; + case WINDOW_TOOLBOX: nRT = C_ToolBox; break; +// Gibts nicht case WINDOW_VALUESET: nRT = C_ValueSet; break; + case WINDOW_CONTROL: nRT = C_Control; break; + case WINDOW_OKBUTTON: nRT = C_OkButton; break; + case WINDOW_CANCELBUTTON: nRT = C_CancelButton; break; + case WINDOW_BUTTONDIALOG: nRT = C_ButtonDialog; break; + case WINDOW_TREELISTBOX: nRT = C_TreeListBox; break; + + case WINDOW_DIALOG: nRT = C_Dialog; break; } #ifdef DBG_UTIL // Die Werte n sind bei den WindowTypen nicht mehr vergeben, werden aber in der AutoID noch verwendet @@ -704,7 +704,7 @@ BOOL StatementSlot::Execute() } -/* Neues Verfahren ab 334! +/* Neues Verfahren ab 334! Neue Methode zum einstellen, daß Modale Dialoge immer Asynchron aufgerufen werden und echter Returnwert, ob Slot geklappt hat und Testen ob Slot überhaupt durch UI aufgerufen werden kann */ @@ -755,13 +755,13 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, m_pDbgWin->AddText( " Methode: " ); m_pDbgWin->AddText( aSmartMethodId.GetText() ); m_pDbgWin->AddText( " Params:" ); - if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} - if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} - if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );} - if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );} - if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );} - if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );} - if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );} + if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} + if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} + if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );} + if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );} + if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );} + if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );} + if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );} if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );} if( nParams & PARAM_BOOL_2 ) {m_pDbgWin->AddText( " b2:" );m_pDbgWin->AddText( bBool2 ? "TRUE" : "FALSE" );} m_pDbgWin->AddText( "\n" ); @@ -788,28 +788,28 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) aSmartMethodId = SmartId( nMethodId ); pCmdIn->Read( nParams ); - if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); - if( nParams & PARAM_USHORT_2 ) pCmdIn->Read( nNr2 ); - if( nParams & PARAM_USHORT_3 ) pCmdIn->Read( nNr3 ); - if( nParams & PARAM_USHORT_4 ) pCmdIn->Read( nNr4 ); - if( nParams & PARAM_ULONG_1 ) pCmdIn->Read( nLNr1 ); - if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 ); - if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 ); - if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 ); - if( nParams & PARAM_BOOL_2 ) pCmdIn->Read( bBool2 ); + if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); + if( nParams & PARAM_USHORT_2 ) pCmdIn->Read( nNr2 ); + if( nParams & PARAM_USHORT_3 ) pCmdIn->Read( nNr3 ); + if( nParams & PARAM_USHORT_4 ) pCmdIn->Read( nNr4 ); + if( nParams & PARAM_ULONG_1 ) pCmdIn->Read( nLNr1 ); + if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 ); + if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 ); + if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 ); + if( nParams & PARAM_BOOL_2 ) pCmdIn->Read( bBool2 ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Reading Conmmand:" ); m_pDbgWin->AddText( " Methode: " ); m_pDbgWin->AddText( aSmartMethodId.GetText() ); m_pDbgWin->AddText( " Params:" ); - if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} - if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} - if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );} - if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );} - if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );} - if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );} - if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );} + if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} + if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} + if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );} + if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );} + if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );} + if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );} + if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );} if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );} if( nParams & PARAM_BOOL_2 ) {m_pDbgWin->AddText( " b2:" );m_pDbgWin->AddText( bBool2 ? "TRUE" : "FALSE" );} m_pDbgWin->AddText( "\n" ); @@ -851,7 +851,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst pBase = pBase->GetParent(); } - { // Klammerung, so daß der String nicht während der Rekursion bestehen bleibt + { // Klammerung, so daß der String nicht während der Rekursion bestehen bleibt String aName; BOOL bSkip = FALSE; @@ -959,15 +959,15 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); - if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen. + if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen. { ToolBox *pTB = ((ToolBox*)pBase); USHORT i; for ( i = 0; i < pTB->GetItemCount() ; i++ ) { aName = String(); -// if ( aName.Len() == 0 ) -// aName = pTB->GetQuickHelpText(); +// if ( aName.Len() == 0 ) +// aName = pTB->GetQuickHelpText(); if ( aName.Len() == 0 ) aName = pTB->GetHelpText( pTB->GetItemId( i ) ); if ( aName.Len() == 0 ) @@ -1034,11 +1034,11 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst } } - return; // ToolBox ist hier schon komplett abgehandelt. + return; // ToolBox ist hier schon komplett abgehandelt. } - if ( pBase->GetType() == WINDOW_BUTTONDIALOG // Buttons auf Buttondialogen mit ID + if ( pBase->GetType() == WINDOW_BUTTONDIALOG // Buttons auf Buttondialogen mit ID || pBase->GetType() == WINDOW_MESSBOX || pBase->GetType() == WINDOW_INFOBOX || pBase->GetType() == WINDOW_WARNINGBOX @@ -1078,24 +1078,24 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst break; } - pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird! + pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird! TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName) .AppendAscii(" ButtonId = ").Append(aID), FALSE ); } - return; // ButtonDialog ist hier schon komplett abgehandelt. + return; // ButtonDialog ist hier schon komplett abgehandelt. } Menu* pMenu = GetMatchingMenu( pBase ); - if ( pMenu ) // Menus + if ( pMenu ) // Menus { USHORT i; for ( i = 0; i < pMenu->GetItemCount() ; i++ ) { USHORT nID = pMenu->GetItemId( i ); - + aName = String(); if ( aName.Len() == 0 ) aName = pMenu->GetHelpText( nID ); @@ -1135,7 +1135,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst } } - return; // Menu ist hier schon komplett abgehandelt. + return; // Menu ist hier schon komplett abgehandelt. } } } @@ -1152,8 +1152,8 @@ private: public: SysWinContainer( ToolBox *pClient ); ~SysWinContainer(); - virtual void Resize(); - virtual void Resizing( Size& rSize ); + virtual void Resize(); + virtual void Resizing( Size& rSize ); }; SysWinContainer::SysWinContainer( ToolBox *pClient ) @@ -1180,8 +1180,8 @@ void SysWinContainer::Resize() { Size aSize( GetOutputSizePixel() ); Resizing( aSize ); -// aSize = pClientWin->GetSizePixel(); -// aSize = pClientWin->CalcWindowSizePixel(); +// aSize = pClientWin->GetSizePixel(); +// aSize = pClientWin->CalcWindowSizePixel(); if ( aSize != GetSizePixel() ) { SetOutputSizePixel( aSize ); @@ -1215,9 +1215,9 @@ void SysWinContainer::Resizing( Size& rSize ) class DisplayHidWin : public ToolBox { - Edit *pEdit; - Size aMinEditSize; - USHORT nLastItemID; + Edit *pEdit; + Size aMinEditSize; + USHORT nLastItemID; BOOL bIsDraging; BOOL bIsPermanentDraging; void SetDraging( BOOL bNewDraging ); @@ -1245,10 +1245,10 @@ public: DisplayHidWin(); ~DisplayHidWin(); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Click(); - virtual void Select(); - virtual void SetText( const XubString& rStr ); + virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Click(); + virtual void Select(); + virtual void SetText( const XubString& rStr ); void SetDisplayText( const String &aNewText ){ pEdit->SetText(aNewText); } String GetDisplayText() const { return pEdit->GetText(); } @@ -1262,7 +1262,7 @@ public: void ConfigSent() { bConfigChanged = FALSE; } BOOL IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; } -// BOOL IsAllWin() { return GetItemState( TT_ALLWIN ) == STATE_CHECK; } +// BOOL IsAllWin() { return GetItemState( TT_ALLWIN ) == STATE_CHECK; } BOOL IsDraging() { return bIsDraging; } @@ -1282,7 +1282,7 @@ DisplayHidWin::DisplayHidWin() SetOutStyle( TOOLBOX_STYLE_HANDPOINTER | TOOLBOX_STYLE_FLAT ); pEdit = new Edit( this, WB_CENTER | WB_BORDER ); aMinEditSize = GetItemRect( TT_OUTPUT ).GetSize(); -/**/ aMinEditSize=Size(20,20); +/**/ aMinEditSize=Size(20,20); aMinEditSize.Width() *= 12; pEdit->SetSizePixel( aMinEditSize ); pEdit->Show(); @@ -1326,8 +1326,8 @@ void DisplayHidWin::EnableButtons( ULONG nConf ) void DisplayHidWin::Tracking( const TrackingEvent& rTEvt ) { -// if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK && ( rTEvt.IsTrackingEnded() || rTEvt.IsTrackingCanceled() ) ) -// SetDraging( FALSE ); +// if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK && ( rTEvt.IsTrackingEnded() || rTEvt.IsTrackingCanceled() ) ) +// SetDraging( FALSE ); if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK ) EndTracking( ENDTRACK_CANCEL ); ToolBox::Tracking( rTEvt); @@ -1439,16 +1439,16 @@ BOOL StatementCommand::DisplayHID() { // Return TRUE -> reexecute command - if ( !bBool2 ) // Wird auf FALSE initialisiert + if ( !bBool2 ) // Wird auf FALSE initialisiert { - bBool2 = TRUE; // Wir sind initialisiert. - GetTTSettings()->pDisplayInstance = this; // Und haben die Macht (Alle anderen beenden sich) + bBool2 = TRUE; // Wir sind initialisiert. + GetTTSettings()->pDisplayInstance = this; // Und haben die Macht (Alle anderen beenden sich) if ( !(nParams & PARAM_ULONG_1) ) { - if( GetTTSettings()->pDisplayHidWin ) // Nichts verändern + if( GetTTSettings()->pDisplayHidWin ) // Nichts verändern nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig(); - else // Beim ersten Aufruf wollen wir alles richtig einstellen + else // Beim ersten Aufruf wollen wir alles richtig einstellen nLNr1 = DH_MODE_KURZNAME | DH_MODE_LANGNAME; if( ((nParams & PARAM_BOOL_1) && bBool1) ) @@ -1464,7 +1464,7 @@ BOOL StatementCommand::DisplayHID() if ( GetTTSettings()->pDisplayInstance && GetTTSettings()->pDisplayInstance != this ) { DBG_WARNING("Mehrere DisplayHID am laufen"); - return FALSE; // Noch eine andere Instanz macht das gleiche! + return FALSE; // Noch eine andere Instanz macht das gleiche! } if ( !GetTTSettings()->pDisplayHidWin ) @@ -1494,40 +1494,40 @@ BOOL StatementCommand::DisplayHID() { -#define HIGHLIGHT_WIN( WinPtr ) \ - { \ - Color aLineColMem = WinPtr->GetLineColor(); \ - WinPtr->SetLineColor( Color( COL_WHITE ) ); \ - Color aFillColMem = WinPtr->GetFillColor(); \ - WinPtr->SetFillColor( Color( COL_LIGHTRED ) ); \ - RasterOp aROp = WinPtr->GetRasterOp(); \ - WinPtr->SetRasterOp( ROP_XOR ); \ +#define HIGHLIGHT_WIN( WinPtr ) \ + { \ + Color aLineColMem = WinPtr->GetLineColor(); \ + WinPtr->SetLineColor( Color( COL_WHITE ) ); \ + Color aFillColMem = WinPtr->GetFillColor(); \ + WinPtr->SetFillColor( Color( COL_LIGHTRED ) ); \ + RasterOp aROp = WinPtr->GetRasterOp(); \ + WinPtr->SetRasterOp( ROP_XOR ); \ Size aSz = WinPtr->PixelToLogic( WinPtr->GetSizePixel() );\ ULONG nMaxCornerRadius = WinPtr->PixelToLogic( Point( 80, 0 ) ).X();\ ULONG iCorner = std::max ((ULONG) 8, (ULONG) std::min( nMaxCornerRadius, (ULONG) std::min((ULONG) (aSz.Width() / 6), (ULONG)(aSz.Height() / 6))));\ WinPtr->DrawRect(Rectangle(Point(),aSz), iCorner, iCorner);\ - WinPtr->SetLineColor( aLineColMem ); \ - WinPtr->SetFillColor( aFillColMem ); \ - WinPtr->SetRasterOp( aROp ); \ + WinPtr->SetLineColor( aLineColMem ); \ + WinPtr->SetFillColor( aFillColMem ); \ + WinPtr->SetRasterOp( aROp ); \ } -#define SET_WIN( WinPtr ) \ - if ( StatementList::WinPtrValid(WinPtr) ) \ - { \ - HIGHLIGHT_WIN ( WinPtr ); \ +#define SET_WIN( WinPtr ) \ + if ( StatementList::WinPtrValid(WinPtr) ) \ + { \ + HIGHLIGHT_WIN ( WinPtr ); \ } -#define RESET_WIN( WinPtr ) \ - if ( StatementList::WinPtrValid(WinPtr) ) \ - { \ - WinPtr->Invalidate( INVALIDATE_NOTRANSPARENT ); \ - WinPtr->Update(); \ +#define RESET_WIN( WinPtr ) \ + if ( StatementList::WinPtrValid(WinPtr) ) \ + { \ + WinPtr->Invalidate( INVALIDATE_NOTRANSPARENT ); \ + WinPtr->Update(); \ } GetTTSettings()->Old = GetTTSettings()->Act; -// GetTTSettings()->Act = GetMouseWin(); +// GetTTSettings()->Act = GetMouseWin(); GetTTSettings()->Act = GetTTSettings()->pDisplayHidWin->LastMouseMoveWin(); if ( !StatementList::WinPtrValid ( GetTTSettings()->Old ) ) @@ -1559,14 +1559,14 @@ BOOL StatementCommand::DisplayHID() } else if ( GetTTSettings()->Act ) { -// SET_WIN(GetTTSettings()->Act); +// SET_WIN(GetTTSettings()->Act); if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 ) { GetTTSettings()->Act->SetSmartUniqueId( SmartId( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) ); GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified(); } } -/* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen +/* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen { GetTTSettings()->pDisplayHidWin->ToTop( TOTOP_NOGRABFOCUS ); } @@ -1574,12 +1574,12 @@ BOOL StatementCommand::DisplayHID() if ( GetTTSettings()->pDisplayHidWin->IsSendData() /*&& bBool2*/ && GetTTSettings()->Act ) { if ( !StatementFlow::bSending ) - { // Normalerweise syncronisierung über Protokoll. Hier ist das aber asyncron!!! + { // Normalerweise syncronisierung über Protokoll. Hier ist das aber asyncron!!! WriteControlData( GetTTSettings()->Act, GetTTSettings()->pDisplayHidWin->GetConfig() ); - new StatementFlow( this, F_EndCommandBlock ); // Kommando zum Senden erzeugen und in que eintragen + new StatementFlow( this, F_EndCommandBlock ); // Kommando zum Senden erzeugen und in que eintragen } } - } //if ( GetTTSettings()->pDisplayHidWin->IsDraging() ) + } //if ( GetTTSettings()->pDisplayHidWin->IsDraging() ) else { if ( GetTTSettings()->Act ) @@ -1589,17 +1589,17 @@ BOOL StatementCommand::DisplayHID() } } - if ( pFirst == this ) // Sollte immer so sein, aber besser isses - if ( pNext ) // Befehle warten auf Ausführung - { // An Ende neu einsortieren + if ( pFirst == this ) // Sollte immer so sein, aber besser isses + if ( pNext ) // Befehle warten auf Ausführung + { // An Ende neu einsortieren Advance(); QueStatement( NULL ); } -// { // Ersten und 2. austauschen. -// pFirst = pNext; -// pNext = pNext->pNext; -// pFirst->pNext = this; -// } +// { // Ersten und 2. austauschen. +// pFirst = pNext; +// pNext = pNext->pNext; +// pFirst->pNext = this; +// } } else @@ -1624,8 +1624,8 @@ private: Timer InplaceTimer; -// virtual void MouseButtonUp( const MouseEvent& rMEvt ); -// virtual void MouseMove( const MouseEvent& rMEvt ); +// virtual void MouseButtonUp( const MouseEvent& rMEvt ); +// virtual void MouseMove( const MouseEvent& rMEvt ); PushButton PushButtonTT_PB_NEXT; GroupBox GroupBoxTT_GB_TRANSLATION; @@ -1752,7 +1752,7 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG ) { if ( bSelecting ) { -// ReleaseMouse(); +// ReleaseMouse(); bSelecting = FALSE; } else @@ -1760,7 +1760,7 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG ) if ( TestChangedDataSaved() ) { PushButtonTT_PB_RESTORE.Disable(); -// CaptureMouse(); +// CaptureMouse(); bSelecting = TRUE; } } @@ -1778,11 +1778,11 @@ IMPL_LINK( TranslateWin, DoRestore, PushButton*, EMPTYARG ) sTT_E_NEW.SearchAndReplaceAll( CUniString("\\t"), CUniString("\t") ); if ( StatementList::WinPtrValid( pTranslateWin ) && pTranslateWin->GetText().CompareTo( sTT_E_NEW ) == COMPARE_EQUAL ) - { // Im ersten schritt nur in der UI zurück + { // Im ersten schritt nur in der UI zurück pTranslateWin->SetText( sTT_E_OLD ); } else - { // Im zweite Schritt auch den eingegebenen Text + { // Im zweite Schritt auch den eingegebenen Text EditTT_E_NEW.SetText( FixedTextTT_FT_OLD.GetText() ); PushButtonTT_PB_RESTORE.Disable(); } @@ -1867,14 +1867,14 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt ) } else if ( Act ) { - // SET_WIN(Act); + // SET_WIN(Act); } - /* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen + /* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen { ToTop(); } */ - } //if ( bSelecting ) + } //if ( bSelecting ) else { if ( Act ) @@ -1908,7 +1908,7 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt ) EditTT_E_COMMENT.Enable(); PushButtonTT_PB_ACCEPT.Enable(); } - // ReleaseMouse(); + // ReleaseMouse(); bSelecting = FALSE; } } @@ -1916,9 +1916,9 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt ) return 0; } -#define FDS_ACTION_COLLECT 1 -#define FDS_ACTION_MARK 2 -#define FDS_ACTION_UNMARK 3 +#define FDS_ACTION_COLLECT 1 +#define FDS_ACTION_MARK 2 +#define FDS_ACTION_UNMARK 3 class FindShortcutErrors: public Search { @@ -1934,7 +1934,7 @@ public: FindShortcutErrors::FindShortcutErrors() : Search( SEARCH_NOOVERLAP | SEARCH_NO_TOPLEVEL_WIN ) { - SetAction( FDS_ACTION_COLLECT ); // Wir fange immer mit sammeln an, ODER?? + SetAction( FDS_ACTION_COLLECT ); // Wir fange immer mit sammeln an, ODER?? } void FindShortcutErrors::SetAction( USHORT nA ) @@ -1975,10 +1975,10 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin ) case FDS_ACTION_MARK: { BOOL bMissing = FALSE; - if ( !bHasAccel && aText.Len() ) // should there be an accelarator defined + if ( !bHasAccel && aText.Len() ) // should there be an accelarator defined { - Window* pChild; + Window* pChild; pChild = pWin->GetWindow( WINDOW_CLIENT ); if ( (pChild->GetType() == WINDOW_RADIOBUTTON) || @@ -2076,7 +2076,7 @@ String TranslateWin::MarkShortcutErrors( Window* pBase, BOOL bMark ) FindShortcutErrors aFinder; if ( bMark ) { - StatementList::SearchAllWin( pBase, aFinder, TRUE ); // collect Shortcuts first + StatementList::SearchAllWin( pBase, aFinder, TRUE ); // collect Shortcuts first aFinder.SetAction( FDS_ACTION_MARK ); } else @@ -2124,7 +2124,7 @@ void StatementCommand::Translate() GetTTSettings()->bToTop = FALSE; } -// GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->Enable( TRUE, TRUE ); +// GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->Enable( TRUE, TRUE ); GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( TRUE, TRUE ); if ( GetTTSettings()->pTranslateWin->IsTranslationAvailable() ) @@ -2166,7 +2166,7 @@ void StatementCommand::Translate() aTranslation += TypeString( pParentDialog->GetType() ); } else - aTranslation.AppendAscii( "0;" ); // Zahl + leerer String + aTranslation.AppendAscii( "0;" ); // Zahl + leerer String aTranslation += ';'; aTranslation += '\"'; @@ -2219,7 +2219,7 @@ void StatementCommand::Translate() } Window* StatementCommand::GetNextOverlap( Window* pBase ) -{ // Findet irgendwelche Overlap-Fenster, die schließbar aussehen +{ // Findet irgendwelche Overlap-Fenster, die schließbar aussehen // Eventuell muß noch die Auswahl verfeinert werden. if ( pBase->GetType() != WINDOW_BORDERWINDOW ) @@ -2269,7 +2269,7 @@ Window* StatementCommand::GetNextRecoverWin() { Window* pTB = pControl->GetChild( 0 ); if ( pControl->GetChildCount() == 1 && pTB->GetType() == WINDOW_TOOLBOX ) -// return pTB; +// return pTB; ; // do not act on floating toolboxes #i38796 else return pControl; @@ -2323,25 +2323,25 @@ BOOL StatementCommand::Execute() #if OSL_DEBUG_LEVEL > 1 -#define REPORT_WIN_CLOSED(pControl, aInfo) \ - _REPORT_WIN_CLOSED(pControl, aInfo) \ +#define REPORT_WIN_CLOSED(pControl, aInfo) \ + _REPORT_WIN_CLOSED(pControl, aInfo) \ m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString(pControl->GetSmartUniqueOrHelpId()) ) ); #else -#define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo) +#define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo) #endif -#define REPORT_WIN_CLOSEDc(pControl, aInfo ) \ +#define REPORT_WIN_CLOSEDc(pControl, aInfo ) \ REPORT_WIN_CLOSED(pControl, CUniString(aInfo) ) -#define _REPORT_WIN_CLOSED(pControl, aInfo) \ - if ( aString1.Len() ) \ - aString1 += '\n'; \ - aString1 += aInfo; \ - aString1.AppendAscii(" \""); \ - aString1 += pControl->GetText(); \ +#define _REPORT_WIN_CLOSED(pControl, aInfo) \ + if ( aString1.Len() ) \ + aString1 += '\n'; \ + aString1 += aInfo; \ + aString1.AppendAscii(" \""); \ + aString1 += pControl->GetText(); \ aString1.AppendAscii("\" geschlossen, RType = ");\ - aString1 += TypeString(pControl->GetType()); \ - aString1.AppendAscii(", UId = "); \ + aString1 += TypeString(pControl->GetType()); \ + aString1.AppendAscii(", UId = "); \ aString1 += UIdString(pControl->GetSmartUniqueOrHelpId()); @@ -2353,7 +2353,7 @@ BOOL StatementCommand::Execute() nLNr1 = Time().GetTime() + nNr1/10; bBool1 = TRUE; } - if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit + if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit return FALSE; break; case RC_DisplayHid: @@ -2364,11 +2364,11 @@ BOOL StatementCommand::Execute() { if ( !bBool1 ) { - nRetryCount = 150; // das sollte reichen. - bBool1 = TRUE; // Nur beim ersten mal! - nNr1 = 1; // Welcher Button ist dran? - nLNr1 = 0; // Speichern des AppWin - aString1 = UniString(); // Liste der geschlossenen Fenster + nRetryCount = 150; // das sollte reichen. + bBool1 = TRUE; // Nur beim ersten mal! + nNr1 = 1; // Welcher Button ist dran? + nLNr1 = 0; // Speichern des AppWin + aString1 = UniString(); // Liste der geschlossenen Fenster // So daß nacher auch wieder alles auf Default steht nUseBindings = 0; @@ -2390,7 +2390,7 @@ BOOL StatementCommand::Execute() bBool2 = FALSE; // flag for wait when all windows are closed pControl->GrabFocus(); - if ( pControl->GetType() != WINDOW_DOCKINGWINDOW + if ( pControl->GetType() != WINDOW_DOCKINGWINDOW && pControl->GetType() != WINDOW_FLOATINGWINDOW && pControl->GetType() != WINDOW_MODELESSDIALOG && pControl->GetType() != WINDOW_WORKWINDOW @@ -2401,7 +2401,7 @@ BOOL StatementCommand::Execute() short nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() ); if ( nRT == C_TabControl && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG ) - { // Bei Tabcontrol den zugehörigen Tabdialog nehmen + { // Bei Tabcontrol den zugehörigen Tabdialog nehmen pControl = pControl->GET_REAL_PARENT(); nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() ); } @@ -2436,7 +2436,7 @@ BOOL StatementCommand::Execute() SET_WINP_CLOSING(pControl); pBD->EndDialog(RET_OK); } - nNr1 = 10; // Nochmal alle Buttons der Reihe nach + nNr1 = 10; // Nochmal alle Buttons der Reihe nach break; case 4: if ( pBD->GetPushButton( BUTTONID_CANCEL ) ) @@ -2456,7 +2456,7 @@ BOOL StatementCommand::Execute() } nNr1++; break; - case 2: // BUG 48239 + case 2: // BUG 48239 case 1: if ( pBD->GetPushButton( BUTTONID_NO ) ) { @@ -2503,19 +2503,19 @@ BOOL StatementCommand::Execute() // Eigentlich nur bei TaskWindows! Hoffen wir mal, daß keine anderen DockingWindows dazwischen hauen. if ( (Window*)nLNr1 != pControl ) - nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen + nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen nLNr1 = (ULONG)pControl; return FALSE; } } if ( nRetryCount-- - && ( (pControl->GetType() == WINDOW_FLOATINGWINDOW) - || (pControl->GetType() == WINDOW_MODELESSDIALOG) - || (pControl->GetType() == WINDOW_WORKWINDOW) - || (pControl->GetType() == WINDOW_BORDERWINDOW) ) ) + && ( (pControl->GetType() == WINDOW_FLOATINGWINDOW) + || (pControl->GetType() == WINDOW_MODELESSDIALOG) + || (pControl->GetType() == WINDOW_WORKWINDOW) + || (pControl->GetType() == WINDOW_BORDERWINDOW) ) ) { - // if ( pControl->GetStyle() & WB_CLOSEABLE ) + // if ( pControl->GetStyle() & WB_CLOSEABLE ) { #ifdef RESET_APPLICATION_TO_BACKING_WINDOW // Special handling for last Document; do not close the Frame, only the Document @@ -2535,7 +2535,7 @@ BOOL StatementCommand::Execute() // nur bei TaskWindows! if ( (Window*)nLNr1 != pControl ) - nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen + nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen nLNr1 = (ULONG)pControl; return FALSE; @@ -2552,7 +2552,7 @@ BOOL StatementCommand::Execute() // Eigentlich nur bei TaskWindows! if ( (Window*)nLNr1 != pControl ) - nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen + nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen nLNr1 = (ULONG)pControl; return FALSE; @@ -2568,7 +2568,7 @@ BOOL StatementCommand::Execute() nLNr1 = Time().GetTime() + 100; // 100 = 1 Second bBool2 = TRUE; } - if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit + if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit return FALSE; else pRet->GenReturn ( RET_Value, aSmartMethodId, aString1); @@ -2588,7 +2588,7 @@ BOOL StatementCommand::Execute() pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSFinished) ); else { - if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit + if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit return FALSE; pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSTimeout) ); } @@ -2602,12 +2602,12 @@ BOOL StatementCommand::Execute() switch ( nMethodId ) { - case RC_AppDelay: // Diese Befehle werden anderswo behandelt + case RC_AppDelay: // Diese Befehle werden anderswo behandelt case RC_DisplayHid: case RC_ResetApplication: case RC_WaitSlot: - case RC_AppAbort: // Sofortiges Löschen aller Befehle + case RC_AppAbort: // Sofortiges Löschen aller Befehle break; case RC_Assert: { @@ -2640,8 +2640,8 @@ BOOL StatementCommand::Execute() { BOOL bWait = FALSE; ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) ); -// if ( Application::GetAppWindow() ) -// bWait = Application::GetAppWindow()->IsWait(); +// if ( Application::GetAppWindow() ) +// bWait = Application::GetAppWindow()->IsWait(); pRet->GenReturn ( RET_Value, aSmartMethodId, bWait ); break; } @@ -2690,12 +2690,12 @@ BOOL StatementCommand::Execute() nUseBindings = 0; break; case RC_Profile: - // Bei folgenden Parametern passiert folgendes: - // ein boolean=false Alles Profiling stoppen (Ergebnisse liefern) - // ein boolean=true, 1-4 ints Einteilung der Zeiten in Kästchen - // kein! boolean keine ints loggen jeden Befehls - // kein! boolean 1 int loggen alle int Millisekunden - // ein String wird in das Logfile übernommen(sonst passiert nichts) + // Bei folgenden Parametern passiert folgendes: + // ein boolean=false Alles Profiling stoppen (Ergebnisse liefern) + // ein boolean=true, 1-4 ints Einteilung der Zeiten in Kästchen + // kein! boolean keine ints loggen jeden Befehls + // kein! boolean 1 int loggen alle int Millisekunden + // ein String wird in das Logfile übernommen(sonst passiert nichts) if( !(nParams & PARAM_BOOL_1) || bBool1 ) { if ( !pProfiler ) @@ -2705,7 +2705,7 @@ BOOL StatementCommand::Execute() } if( !(nParams & PARAM_BOOL_1) && (nParams & PARAM_USHORT_1) ) - { // Autoprofiling: Profile nNr + { // Autoprofiling: Profile nNr if ( pProfiler->IsProfilingPerCommand() ) { pProfiler->StopProfilingPerCommand(); @@ -2716,7 +2716,7 @@ BOOL StatementCommand::Execute() pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() ); } else if ( nParams & PARAM_USHORT_1 ) - { // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr] + { // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr] comm_ULONG nAnzahl=0; if ( nParams & PARAM_USHORT_1 ) { nAnzahl++; }; if ( nParams & PARAM_USHORT_2 ) { nAnzahl++; }; @@ -2736,13 +2736,13 @@ BOOL StatementCommand::Execute() pProfiler->StartPartitioning(); } - else if( nParams == PARAM_STR_1 ) // Genau ein String! - { // Nur einen String ins Profiling aufnehmen + else if( nParams == PARAM_STR_1 ) // Genau ein String! + { // Nur einen String ins Profiling aufnehmen aString1 += '\n'; pRet->GenReturn( RET_ProfileInfo, SmartId(), aString1 ); } else - { // Normales Profiling je Kommando: profile + { // Normales Profiling je Kommando: profile if ( pProfiler->IsAutoProfiling() ) { pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); @@ -2754,7 +2754,7 @@ BOOL StatementCommand::Execute() pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() ); } } - else // Profiling wieder ausschalten: Profile false + else // Profiling wieder ausschalten: Profile false if ( pProfiler ) { if ( pProfiler->IsProfilingPerCommand() ) @@ -2797,7 +2797,7 @@ BOOL StatementCommand::Execute() { if ( nErr == 1 ) ReportError( GEN_RES_STR0( S_NO_POPUP ) ); - else + else ReportError( GEN_RES_STR0( S_NO_SUBMENU ) ); break; } @@ -2811,8 +2811,8 @@ BOOL StatementCommand::Execute() { nItemCount = pMenu->GetItemCount(); if ( pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES ) - { // jep, we have to adjust the count - BOOL bLastWasSeperator = TRUE; // TRUE for Separator at the top + { // jep, we have to adjust the count + BOOL bLastWasSeperator = TRUE; // TRUE for Separator at the top for ( USHORT i = 0 ; i < pMenu->GetItemCount() ; i++ ) { if ( !pMenu->IsItemEnabled( pMenu->GetItemId( i ) ) ) @@ -2824,7 +2824,7 @@ BOOL StatementCommand::Execute() bLastWasSeperator = pMenu->GetItemType( i ) == MENUITEM_SEPARATOR; } } - if ( bLastWasSeperator ) // Separator at bottom + if ( bLastWasSeperator ) // Separator at bottom nItemCount--; } } @@ -2840,8 +2840,8 @@ BOOL StatementCommand::Execute() { nPhysicalIndex = nNr1; if ( pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES ) - { // jep, we have to adjust the position - BOOL bLastWasSeperator = TRUE; // TRUE for Separator at the top + { // jep, we have to adjust the position + BOOL bLastWasSeperator = TRUE; // TRUE for Separator at the top USHORT nVisibleCount = 0; for ( USHORT i = 0 ; i < pMenu->GetItemCount() && nVisibleCount < nNr1 ; i++ ) { @@ -2879,7 +2879,7 @@ BOOL StatementCommand::Execute() { USHORT nLogicalPos = pMenu->GetItemPos(nNr1); if ( MENU_ITEM_NOTFOUND != nLogicalPos && pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES ) - { // jep, we have to adjust the position + { // jep, we have to adjust the position if ( !pMenu->IsItemEnabled( nNr1 ) ) nLogicalPos = MENU_ITEM_NOTFOUND; else @@ -3011,8 +3011,8 @@ BOOL StatementCommand::Execute() nErrorcode = aDir.GetError(); if ( !nErrorcode && !aDir.MakeDir() ) nErrorcode = FSYS_ERR_UNKNOWN; -// Workaround für Bug 60693 -// nErrorcode = aDir.GetError(); +// Workaround für Bug 60693 +// nErrorcode = aDir.GetError(); } break; case RC_FileCopy: @@ -3128,10 +3128,10 @@ BOOL StatementCommand::Execute() { pRet->GenReturn ( RET_Value, aSmartMethodId, aPath ); } - - - -/* keep old Implementation for now + + + +/* keep old Implementation for now // neues Verzeichnis einlesen if ( (nParams & PARAM_STR_1) ) { @@ -3156,7 +3156,7 @@ BOOL StatementCommand::Execute() nDirPos = 0; FileStat aFS( aEntry ); if ( !aFS.IsKind( FSYS_KIND_WILD ) && !aFS.IsKind( FSYS_KIND_DIR ) && aEntry.Exists() ) - { // Sonderbehandlung für genau einen Eintrag + { // Sonderbehandlung für genau einen Eintrag if ( !aFS.IsKind( FSYS_KIND_DIR ) && ( aDirEntryKind == FSYS_KIND_DIR ) ) pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); else @@ -3322,9 +3322,9 @@ BOOL StatementCommand::Execute() case RC_GetMouseStyle: { Pointer aPointer; -// if ( DragManager::GetDragManager() ) -// aPointer = DragManager::GetDragManager()->GetDragPointer(); -// else +// if ( DragManager::GetDragManager() ) +// aPointer = DragManager::GetDragManager()->GetDragPointer(); +// else { Window *pActualWin = GetMouseWin(); if ( pActualWin ) @@ -3354,7 +3354,7 @@ BOOL StatementCommand::Execute() #if OSL_DEBUG_LEVEL > 1 USHORT nEntries = Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR ).Count(); - (void) nEntries; /* avoid warning about unused parameter */ + (void) nEntries; /* avoid warning about unused parameter */ #endif // The Count is only larger than 2 is the path is a directory which is not empty // the Count of 2 results from the "." and ".." directory @@ -3586,15 +3586,15 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) pCmdIn->Read( nMethodId ); pCmdIn->Read( nParams ); - if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); - if( nParams & PARAM_USHORT_2 ) pCmdIn->Read( nNr2 ); - if( nParams & PARAM_USHORT_3 ) pCmdIn->Read( nNr3 ); - if( nParams & PARAM_USHORT_4 ) pCmdIn->Read( nNr4 ); - if( nParams & PARAM_ULONG_1 ) pCmdIn->Read( nLNr1 ); - if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 ); - if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 ); - if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 ); - if( nParams & PARAM_BOOL_2 ) pCmdIn->Read( bBool2 ); + if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); + if( nParams & PARAM_USHORT_2 ) pCmdIn->Read( nNr2 ); + if( nParams & PARAM_USHORT_3 ) pCmdIn->Read( nNr3 ); + if( nParams & PARAM_USHORT_4 ) pCmdIn->Read( nNr4 ); + if( nParams & PARAM_ULONG_1 ) pCmdIn->Read( nLNr1 ); + if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 ); + if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 ); + if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 ); + if( nParams & PARAM_BOOL_2 ) pCmdIn->Read( bBool2 ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Reading Control: UId: " ); @@ -3602,13 +3602,13 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) m_pDbgWin->AddText( " Methode: " ); m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( " Params:" ); - if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} - if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} - if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );} - if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );} - if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );} - if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );} - if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );} + if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} + if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} + if( nParams & PARAM_USHORT_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );} + if( nParams & PARAM_USHORT_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );} + if( nParams & PARAM_ULONG_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );} + if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );} + if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );} /* if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 ); if( nParams & PARAM_BOOL_2 ) pCmdIn->Read( bBool2 );*/ m_pDbgWin->AddText( "\n" ); @@ -3616,7 +3616,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) } BOOL IsDialog(Window *pWin) -{ // Alles was von SystemWindow abgeleitet ist +{ // Alles was von SystemWindow abgeleitet ist if ( !pWin ) return FALSE; @@ -3649,10 +3649,10 @@ BOOL IsDialog(Window *pWin) return TRUE; -// break; +// break; default: return FALSE; -// break; +// break; } } @@ -3817,7 +3817,7 @@ void StatementControl::AnimateMouse( Window *pControl, Point aWohin ) aDiff *= 1000; aDiff /= nSteps; - StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack // Das verhindert, daß schon der nächste Befehl ausgeführt wird. for ( ; nSteps ; nSteps-- ) @@ -3830,7 +3830,7 @@ void StatementControl::AnimateMouse( Window *pControl, Point aWohin ) SafeReschedule(); } pControl->SetPointerPosPixel(aZiel); - StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack } @@ -3844,13 +3844,13 @@ BOOL StatementControl::MaybeDoTypeKeysDelay( Window *pTestWindow ) Timer aTimer; aTimer.SetTimeout( nTimeWait ); aTimer.Start(); - StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack // Das verhindert, daß schon der nächste Befehl ausgeführt wird. while ( aTimer.IsActive() ) { SafeReschedule( TRUE ); } - StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack if ( !WinPtrValid(pTestWindow ) ) { ReportError( aUId, GEN_RES_STR1( S_WINDOW_DISAPPEARED, MethodString( nMethodId ) ) ); @@ -3862,7 +3862,7 @@ BOOL StatementControl::MaybeDoTypeKeysDelay( Window *pTestWindow ) BOOL StatementControl::HandleVisibleControls( Window *pControl ) { - if( pControl ) // Also auch bei Disabled nicht jedoch bei Invisible + if( pControl ) // Also auch bei Disabled nicht jedoch bei Invisible { switch( nMethodId ) { @@ -3874,11 +3874,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) break; case M_GetPosX: if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border if ( (nParams & PARAM_BOOL_1) && bBool1 ) pControl = pControl->GetWindow( WINDOW_OVERLAP ); @@ -3893,11 +3893,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) break; case M_GetPosY: if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border if ( (nParams & PARAM_BOOL_1) && bBool1 ) pControl = pControl->GetWindow( WINDOW_OVERLAP ); @@ -3912,11 +3912,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) break; case M_GetSizeX: if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border if ( (nParams & PARAM_BOOL_1) && bBool1 ) pControl = pControl->GetWindow( WINDOW_OVERLAP ); @@ -3924,11 +3924,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) break; case M_GetSizeY: if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border if ( (nParams & PARAM_BOOL_1) && bBool1 ) pControl = pControl->GetWindow( WINDOW_OVERLAP ); @@ -3937,11 +3937,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) case M_SnapShot: { if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW ) - pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border + pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border if ( (nParams & PARAM_BOOL_1) && bBool1 ) pControl = pControl->GetWindow( WINDOW_OVERLAP ); @@ -3966,7 +3966,7 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) nNr4 = std::min((USHORT)(pControl->GetSizePixel().Height() + 2*(USHORT)aStart.Y()),nNr4); } if( nParams & PARAM_USHORT_4 ) - { // Zuschneiden + { // Zuschneiden Point aPt(-nNr1,-nNr2); Size aSz(nNr3,nNr4); VirtualDevice aVDev( *pControl ); @@ -4012,9 +4012,9 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) BOOL StatementControl::HandleCommonMethods( Window *pControl ) { - switch( nMethodId ) // Diese können an jedem Window ausgeführt werden + switch( nMethodId ) // Diese können an jedem Window ausgeführt werden { - case M_Exists: // Oben schon Behandelt. Unterdrückt hier nur Fehler + case M_Exists: // Oben schon Behandelt. Unterdrückt hier nur Fehler case M_NotExists: case M_IsEnabled: case M_IsVisible: @@ -4035,12 +4035,12 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_TypeKeys: { - if( !(nParams & PARAM_USHORT_1) ) // Anzahl wiederholungen + if( !(nParams & PARAM_USHORT_1) ) // Anzahl wiederholungen nNr1 = 1; - if( !(nParams & PARAM_BOOL_1) ) // Follow Focus - bBool1 = FALSE; // so bleibt das bisherige Verhalten + if( !(nParams & PARAM_BOOL_1) ) // Follow Focus + bBool1 = FALSE; // so bleibt das bisherige Verhalten - if ( !bBool1 ) // Altes Verhalten + if ( !bBool1 ) // Altes Verhalten pControl->GrabFocus(); else // If focus is not inside given control we grab it once. { @@ -4052,7 +4052,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) // maybe this can get removed since we are using GetPreferredKeyInputWindow() if ( pControl->GetType() == WINDOW_COMBOBOX ) - { // Bei COMBOBOX an das Edit direkt liefern + { // Bei COMBOBOX an das Edit direkt liefern Window *pTemp = NULL; for ( USHORT i = 0 ; i < pControl->GetChildCount() && !pTemp ; i++ ) if ( pControl->GetChild( i )->GetType() == WINDOW_EDIT ) @@ -4071,12 +4071,12 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( !pFocus || !pControl->IsWindowOrChild( pFocus, TRUE ) ) pControl->GrabFocus(); } - if ( bBool1 ) // Jedesmal das FocusWindow finden + if ( bBool1 ) // Jedesmal das FocusWindow finden { Window *pFocus = GetpApp()->GetFocusWindow(); if ( pFocus && pControl->IsWindowOrChild( pFocus, TRUE ) ) pDeliverHere = pFocus; - else // sonst fallback auf das Basisfenster + else // sonst fallback auf das Basisfenster pDeliverHere = pControl; } pDeliverHere = pDeliverHere->GetPreferredKeyInputWindow(); @@ -4118,7 +4118,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) aCh += 'a'; break; case KEYGROUP_MISC: - { // CR ESC TAB BACK + { // CR ESC TAB BACK ByteString aPrintableMisc("\x0d\x1b\x09\x08 **+-*/.,<>=",16); if ( nKeyCode-KEY_RETURN < aPrintableMisc.Len() && nKeyCode != KEY_INSERT && nKeyCode != KEY_DELETE ) @@ -4147,7 +4147,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_NUM + aCh-'0', 0)); else if ( aPrintableMisc.Search(aCh) != STRING_NOTFOUND ) aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_MISC + (USHORT)aPrintableMisc.Search(aCh), 0)); - else // Sollte eigentlich nicht auftreten + else // Sollte eigentlich nicht auftreten aEvent = KeyEvent(aCh, KeyCode()); } ImplKeyInput( pDeliverHere, aEvent ); @@ -4177,11 +4177,11 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) Size aS = pControl->GetOutputSizePixel(); Point aPos = Point(aS.Width() * nNr1 / 100,aS.Height() * nNr2 / 100); Window *pActualWin = pControl->FindWindow( aPos ); -// AnimateMouse( pControl, aPos ); +// AnimateMouse( pControl, aPos ); if ( pActualWin ) aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) ); -// aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); +// aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); else pActualWin = pControl; @@ -4200,12 +4200,12 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( pActualWin ) aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) ); -// aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); +// aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); else pActualWin = pControl; AnimateMouse( pActualWin, aPos ); -// pActualWin->GrabFocus(); +// pActualWin->GrabFocus(); MouseEvent aMEvt( aPos, 1, MOUSE_SIMPLECLICK|MOUSE_SELECT, nButton ); ImplMouseButtonUp( pActualWin, aMEvt ); } @@ -4220,13 +4220,13 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( pActualWin ) { aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) ); -// aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); +// aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); } else pActualWin = pControl; AnimateMouse( pActualWin, aPos ); -// pActualWin->GrabFocus(); +// pActualWin->GrabFocus(); MouseEvent aMEvt( aPos, 0, MOUSE_SIMPLEMOVE|MOUSE_DRAGMOVE, nButton ); ImplMouseMove( pActualWin, aMEvt ); } @@ -4241,7 +4241,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( pActualWin ) { aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) ); -// aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); +// aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); } else pActualWin = pControl; @@ -4314,7 +4314,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( pActualWin ) { aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) ); - // aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); + // aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) ); pControl = pActualWin; } } @@ -4380,12 +4380,12 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; } - pControl = pTemp; // So daß wir unten ohne Fehler durchkommen + pControl = pTemp; // So daß wir unten ohne Fehler durchkommen SplitWindow *pSW = (SplitWindow*) pTemp; -// Rectangle GetAutoHideRect() const; -// Rectangle GetFadeInRect() const; -// Rectangle GetFadeOutRect() const; +// Rectangle GetAutoHideRect() const; +// Rectangle GetFadeInRect() const; +// Rectangle GetFadeOutRect() const; switch( nMethodId ) { @@ -4407,7 +4407,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) ImplMouseButtonDown( pControl, aMEvnt, FORCE_DIRECT_CALL ); ImplMouseButtonUp ( pControl, aMEvnt, FORCE_DIRECT_CALL ); } -// pSW->AutoHide(); +// pSW->AutoHide(); break; case M_IsFadeIn: pRet->GenReturn ( RET_Value, aUId, pSW->IsFadeOutButtonVisible() ); @@ -4496,7 +4496,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) } if( !(nParams & PARAM_USHORT_1) ) - nNr1 = CONST_ALIGN_RIGHT; // default is right Scrollbar(vertical) + nNr1 = CONST_ALIGN_RIGHT; // default is right Scrollbar(vertical) if ( (nNr1 != CONST_ALIGN_RIGHT) && (nNr1 != CONST_ALIGN_BOTTOM) ) { @@ -4604,7 +4604,7 @@ BOOL StatementControl::Execute() case M_GetState: break; case M_IsEnabled: - nMethodId = _M_IsEnabled; // Umlabeln, da die Behandlung essentiell anders ist! + nMethodId = _M_IsEnabled; // Umlabeln, da die Behandlung essentiell anders ist! break; default: pControl = NULL; @@ -4619,25 +4619,25 @@ BOOL StatementControl::Execute() case M_NotExists: Time aT; USHORT aSeconds = aT.GetMin()*60+aT.GetSec(); - if ( !bBool2 ) // wurde im Konstruktor auf FALSE gesetzt + if ( !bBool2 ) // wurde im Konstruktor auf FALSE gesetzt { bBool2 = TRUE; nNr2 = aSeconds; if( !(nParams & PARAM_USHORT_1) ) - nNr1 = 0; // defaultmäßig sofort zurück + nNr1 = 0; // defaultmäßig sofort zurück } - if ( aSeconds < nNr2 ) // Falls die Stunde umgesprungen ist + if ( aSeconds < nNr2 ) // Falls die Stunde umgesprungen ist aSeconds += 60*60; if ( /* !IsAccessable(pControl)#87019# */ !pControl || !pControl->IsVisible() ) pControl = NULL; if ( ((nMethodId == M_Exists) && pControl) || ((nMethodId == M_NotExists) && !pControl) ) - { // Wenn Bedingung erfüllt + { // Wenn Bedingung erfüllt pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)TRUE ); } else - if ( aSeconds <= nNr2 + nNr1 ) // Zeit ist noch nicht abgelaufen + if ( aSeconds <= nNr2 + nNr1 ) // Zeit ist noch nicht abgelaufen return FALSE; else pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)FALSE ); @@ -4645,13 +4645,13 @@ BOOL StatementControl::Execute() Advance(); delete this; return TRUE; -// break; +// break; } short nRT = 0; - if( pControl ) // Das Fenster Existiert irgendwo, kann aber auch hidden sein! + if( pControl ) // Das Fenster Existiert irgendwo, kann aber auch hidden sein! { nRT = ImpGetRType( pControl, aUId ); // If not Numeric pControl is used #if OSL_DEBUG_LEVEL > 1 @@ -4663,8 +4663,8 @@ BOOL StatementControl::Execute() if ( nRT == C_Window && // Search for WorkWindow to satisfy these commands ( nMethodId == M_Close -// || nMethodId == M_Size -// || nMethodId == M_Move +// || nMethodId == M_Size +// || nMethodId == M_Move || nMethodId == M_IsMax || nMethodId == M_IsMin || nMethodId == M_IsRestore @@ -4703,7 +4703,7 @@ BOOL StatementControl::Execute() // TODO: handle GetFocus for all Methods and Windows like this (remove part below) // See for impact of changed focus for HandleVisibleControls() (taking Snapshots might be different, possible exclude those methods) if (( (nRT == C_TreeListBox) && !bBool2 ) - && nMethodId != M_TypeKeys // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht + && nMethodId != M_TypeKeys // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht && nMethodId != M_MouseDown && nMethodId != M_MouseUp && nMethodId != M_MouseMove @@ -4745,7 +4745,7 @@ BOOL StatementControl::Execute() || nRT == C_TreeListBox ) || nMethodId == M_OpenContextMenu ) - && nMethodId != M_TypeKeys // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht + && nMethodId != M_TypeKeys // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht && nMethodId != M_MouseDown && nMethodId != M_MouseUp && nMethodId != M_MouseMove @@ -4754,7 +4754,7 @@ BOOL StatementControl::Execute() /* leads to problems because settext sets the text whereas typekeys adds to the text. if ( bDoTypeKeysDelay && nMethodId == M_SetText && ( nParams & PARAM_STR_1 ) ) - { // Hier wird das Statement auf ein TypeKeys umgebogen + { // Hier wird das Statement auf ein TypeKeys umgebogen nMethodId = M_TypeKeys; nParams = PARAM_BOOL_1 | PARAM_STR_1; bBool1 = TRUE; @@ -4799,7 +4799,7 @@ BOOL StatementControl::Execute() pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText()); break; case M_SetPage : - { // Wegen lokaler Variablen + { // Wegen lokaler Variablen TabControl *pTControl = ((TabControl*)pControl); USHORT nActive = pTControl->GetCurPageId(); USHORT i,anz; @@ -4828,7 +4828,7 @@ BOOL StatementControl::Execute() i++; if ( i >= pTControl->GetPageCount() ) i = 0; - if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) ) // 3 Mal aufrufen + if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) ) // 3 Mal aufrufen break; } if ( !aID.Matches( aWantedID ) ) @@ -5027,7 +5027,7 @@ BOOL StatementControl::Execute() if ( bUnselectBeforeSelect ) pLB->SetNoSelection(); pLB->SelectEntryPos( nPos, bBool1 ); - if ( pLB->IsEntryPosSelected( nPos ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL + if ( pLB->IsEntryPosSelected( nPos ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) ); } } @@ -5040,7 +5040,7 @@ BOOL StatementControl::Execute() if ( bUnselectBeforeSelect ) pLB->SetNoSelection(); pLB->SelectEntryPos( nNr1-1, bBool1 ); - if ( pLB->IsEntryPosSelected( nNr1-1 ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL + if ( pLB->IsEntryPosSelected( nNr1-1 ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), UniString::CreateFromInt32( nNr1 ) ) ); } } @@ -5281,10 +5281,10 @@ BOOL StatementControl::Execute() case C_ToolBox: { ToolBox *pTB = ((ToolBox*)pControl); - if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden + if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden { if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) ) - { // Wir fälschen einen Parameter + { // Wir fälschen einen Parameter if ( aUId.HasNumeric() ) { nParams |= PARAM_ULONG_1; @@ -5364,13 +5364,13 @@ BOOL StatementControl::Execute() case M_Click : { FIND_ITEM; - if ( bItemFound ) // FIND_ITEM Erfolgreich + if ( bItemFound ) // FIND_ITEM Erfolgreich { Rectangle aRect = pTB->GetItemRect(pTB->GetItemId(nItemPos)); if ( aRect.IsEmpty() ) { pTB->ExecuteCustomMenu(); -/* aRect = pTB->GetMenubuttonRect(); +/* aRect = pTB->GetMenubuttonRect(); MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); ImplMouseButtonDown( pTB, aMEvnt );*/ @@ -5395,7 +5395,7 @@ BOOL StatementControl::Execute() case M_TearOff : { FIND_ITEM; - if ( bItemFound ) // FIND_ITEM Erfolgreich + if ( bItemFound ) // FIND_ITEM Erfolgreich { Rectangle aRect = pTB->GetItemPosDropDownRect( nItemPos ); AnimateMouse( pControl, aRect.Center() ); @@ -5404,13 +5404,13 @@ BOOL StatementControl::Execute() Window *pWin = NULL; // Wait for the window to open. - StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack - { // Das verhindert, daß schon der nächste Befehl ausgeführt wird. + StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack + { // Das verhindert, daß schon der nächste Befehl ausgeführt wird. Time aDelay; while ( !pWin && ( (pWin = GetPopupFloatingWin()) == NULL ) && ( Time() - aDelay ).GetSec() < 15 ) SafeReschedule(); } - StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack + StatementList::bExecuting = FALSE; // Bah ist das ein ekliger Hack if ( pWin && pWin->GetType() == WINDOW_FLOATINGWINDOW ) { @@ -5430,7 +5430,7 @@ BOOL StatementControl::Execute() case M_OpenMenu : { FIND_ITEM; - if ( bItemFound ) // FIND_ITEM Erfolgreich + if ( bItemFound ) // FIND_ITEM Erfolgreich { Rectangle aRect = pTB->GetItemPosDropDownRect( nItemPos ); AnimateMouse( pControl, aRect.Center() ); @@ -5449,7 +5449,7 @@ BOOL StatementControl::Execute() case _M_IsEnabled: { FIND_ITEM; - if ( bItemFound ) // FIND_ITEM Erfolgreich + if ( bItemFound ) // FIND_ITEM Erfolgreich { pRet->GenReturn ( RET_Value, aUId, pTB->IsItemEnabled( pTB->GetItemId(nItemPos) ) ); } @@ -5458,7 +5458,7 @@ BOOL StatementControl::Execute() case M_GetState : { FIND_ITEM; - if ( bItemFound ) // FIND_ITEM Erfolgreich + if ( bItemFound ) // FIND_ITEM Erfolgreich { switch (nNr1) { @@ -5509,7 +5509,7 @@ BOOL StatementControl::Execute() case M_IsMax: case M_Minimize: case M_Maximize: - case M_Help: // Alles was unten weiterbehandelt werden soll + case M_Help: // Alles was unten weiterbehandelt werden soll goto DockingWin; default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "ToolBox" ) ); @@ -5524,7 +5524,7 @@ BOOL StatementControl::Execute() -#define GET_NTH_ENTRY_LBOX( First, Next, Anzahl) \ +#define GET_NTH_ENTRY_LBOX( First, Next, Anzahl) \ SvLBoxEntry *pThisEntry = ((SvTreeListBox*)pControl)->First(); \ { \ int niTemp = Anzahl; \ @@ -5586,16 +5586,16 @@ BOOL StatementControl::Execute() bBool1 = TRUE; if( nParams & PARAM_STR_1 ) { -/* ListBox *pLB = ((ListBox*)pControl); +/* ListBox *pLB = ((ListBox*)pControl); if ( pLB->GetEntryPos( aString1 ) == LISTBOX_ENTRY_NOTFOUND ) ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) ); else { pLB->SelectEntry( aString1, bBool1 ); - if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL + if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) ); } -*/ ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) ); +*/ ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) ); } else { @@ -5766,7 +5766,7 @@ BOOL StatementControl::Execute() pThisEntry = (SvLBoxEntry*)pTree->GetEntryAtVisPos( nNr1-1 ); } } - + if ( pThisEntry ) { if ( ! (nParams & PARAM_USHORT_2) ) @@ -5827,7 +5827,7 @@ BOOL StatementControl::Execute() /* - BOOL MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE ); + BOOL MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE ); // access to dynamic values of cursor row String GetColumnTitle( USHORT nColumnId ) const; USHORT GetColumnId( USHORT nPos ) const; @@ -5836,7 +5836,7 @@ BOOL StatementControl::Execute() long GetCurRow() const { return nCurRow; } USHORT GetCurColumnId() const { return nCurColId; } BOOL GoToRow( long nRow ); - BOOL GoToRowAndDoNotModifySelection( long nRow ); + BOOL GoToRowAndDoNotModifySelection( long nRow ); BOOL GoToColumnId( USHORT nColId ); BOOL GoToRowColumnId( long nRow, USHORT nColId ); // selections @@ -5857,11 +5857,11 @@ BOOL StatementControl::Execute() long NextSelectedRow(); const MultiSelection* GetSelection() const { return bMultiSelection ? uRow.pSel : 0; } - void SetSelection( const MultiSelection &rSelection ); + void SetSelection( const MultiSelection &rSelection ); virtual String GetCellText(long _nRow, USHORT _nColId) const; USHORT GetColumnCount() const { return ColCount(); } -protected: +protected: virtual long GetRowCount() const; @@ -5872,9 +5872,9 @@ protected: void InvalidateHandleColumn(); CellControllerRef Controller() const { return aController; } - sal_Int32 GetBrowserFlags() const { return m_nBrowserFlags; } + sal_Int32 GetBrowserFlags() const { return m_nBrowserFlags; } - virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True); + virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True); virtual void DeactivateCell(sal_Bool bUpdate = sal_True); @@ -5927,9 +5927,9 @@ protected: } } break; - - - + + + /* case M_GetSelCount : pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((SvLBox*)pControl)->GetSelectionCount())); @@ -5971,16 +5971,16 @@ protected: bBool1 = TRUE; if( nParams & PARAM_STR_1 ) { - / * ListBox *pLB = ((ListBox*)pControl); + / * ListBox *pLB = ((ListBox*)pControl); if ( pLB->GetEntryPos( aString1 ) == LISTBOX_ENTRY_NOTFOUND ) ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) ); else { pLB->SelectEntry( aString1, bBool1 ); - if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL + if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 ) // XOR rein mit BOOL ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) ); } - * / ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) ); + * / ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) ); } else { @@ -6137,7 +6137,7 @@ protected: else pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pELB->getSelIndex() +1)); break; -/* xxxcase M_SetNoSelection : +/* xxxcase M_SetNoSelection : ((ListBox*)pControl)->SetNoSelection(); ((ListBox*)pControl)->Select(); break; */ @@ -6196,16 +6196,16 @@ protected: pRet->GenReturn ( RET_Value, aUId, aContent ); } break; - case TypeClass_STRING: + case TypeClass_STRING: { ::rtl::OUString aContent; aCell >>= aContent; pRet->GenReturn ( RET_Value, aUId, aContent ); } break; - //case TypeClass_FLOAT: break; - //case TypeClass_DOUBLE: break; - //case TypeClass_OCTET: break; + //case TypeClass_FLOAT: break; + //case TypeClass_DOUBLE: break; + //case TypeClass_OCTET: break; case TypeClass_BYTE: case TypeClass_SHORT: case TypeClass_LONG: @@ -6287,7 +6287,7 @@ protected: if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRows().size() ) ) pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows()[nNr1-1] +1 ) ); break; -/* case M_GetSelText : +/* case M_GetSelText : if ( ! (nParams & PARAM_USHORT_1) ) nNr1 = 1; if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) ) @@ -6384,7 +6384,7 @@ protected: else ReportError( aUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_DOCKING_MODE, MethodString( nMethodId ) ) ); break; - case M_Help: // Alles was unten weiterbehandelt werden soll + case M_Help: // Alles was unten weiterbehandelt werden soll goto MoreDialog; default: @@ -6432,7 +6432,7 @@ protected: SET_WINP_CLOSING(pControl); ((FloatingWindow*)pControl)->Close(); break; - case M_Help: // Alles was unten weiterbehandelt werden soll + case M_Help: // Alles was unten weiterbehandelt werden soll case M_Move: goto MoreDialog; default: @@ -6515,7 +6515,7 @@ protected: case M_Size: case M_Move: goto FloatWin; -// break; +// break; case M_IsMax : pRet->GenReturn ( RET_Value, aUId, ((WorkWindow*)pControl)->IsMaximized() ); break; @@ -6536,7 +6536,7 @@ protected: ((WorkWindow*)pControl)->Maximize( FALSE ); ((WorkWindow*)pControl)->Restore(); break; - case M_Help: // Alles was unten weiterbehandelt werden soll + case M_Help: // Alles was unten weiterbehandelt werden soll goto MoreDialog; default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "WorkWindow" ) ); @@ -6577,7 +6577,7 @@ protected: break; } if ( bDone ) - break; // break the case here else continue at C_ButtonDialog + break; // break the case here else continue at C_ButtonDialog } case C_ButtonDialog: { @@ -6743,7 +6743,7 @@ protected: #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( CUniString("Reschedule command (requed) (").Append( UniString::CreateFromInt32(nRetryCount) ).AppendAscii(")\n") ); #endif - QueStatement( this ); // will que at the start of the list + QueStatement( this ); // will que at the start of the list } else { diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index a4d2b76f5632..e5b98046371f 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.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 @@ -94,10 +94,10 @@ extern "C" #define FORCE_DIRECT_CALL TRUE typedef USHORT SearchFlags; -#define SEARCH_NOOVERLAP ((SearchFlags) 0x0001) -#define SEARCH_NO_TOPLEVEL_WIN ((SearchFlags) 0x0002) -#define SEARCH_FOCUS_FIRST ((SearchFlags) 0x0004) -#define SEARCH_FIND_DISABLED ((SearchFlags) 0x0008) +#define SEARCH_NOOVERLAP ((SearchFlags) 0x0001) +#define SEARCH_NO_TOPLEVEL_WIN ((SearchFlags) 0x0002) +#define SEARCH_FOCUS_FIRST ((SearchFlags) 0x0004) +#define SEARCH_FIND_DISABLED ((SearchFlags) 0x0008) class Search { @@ -113,8 +113,8 @@ public: BOOL HasSearchFlag( SearchFlags aQueryFlag ) { return (nmSearchFlags & aQueryFlag) == aQueryFlag; } }; -BOOL IsDialog(Window *pWin); // Ist *pWin von SystemWindow abgeleitet (Kann es Active sein) -BOOL IsAccessable(Window *pWin); // Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft) +BOOL IsDialog(Window *pWin); // Ist *pWin von SystemWindow abgeleitet (Kann es Active sein) +BOOL IsAccessable(Window *pWin); // Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft) //class SafePointer : CriticalSection @@ -125,7 +125,7 @@ public: SafePointer() { pSelf = this; } virtual ~SafePointer() { DBG_ASSERT(pSelf==this,"Destructor von Nicht existierendem Objekt aufgerufen"); pSelf = NULL; } -// static BOOL IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; } +// static BOOL IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; } // virtual operator -> (); { DBG_ASSERT(pMyself == this,"-> von Nicht existierendem Objekt aufgerufen"); } }; @@ -173,12 +173,12 @@ protected: static BOOL bIsInReschedule; static USHORT nModalCount; - static Window *pLastFocusWindow; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen - static BOOL bWasDragManager; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen - static BOOL bWasPopupMenu; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen + static Window *pLastFocusWindow; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen + static BOOL bWasDragManager; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen + static BOOL bWasPopupMenu; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen static BOOL bBasicWasRunning; - static USHORT nMinTypeKeysDelay; /// Verzögerung der einzelnen Anschläge für TypeKeys + static USHORT nMinTypeKeysDelay; /// Verzögerung der einzelnen Anschläge für TypeKeys static USHORT nMaxTypeKeysDelay; static BOOL bDoTypeKeysDelay; @@ -188,7 +188,7 @@ protected: public: static BOOL IsInReschedule() { return bIsInReschedule; } - void SafeReschedule( BOOL bYield = FALSE ) // Setzt Flag, so daß nicht schon der nächste Befehl ausgeführt wird + void SafeReschedule( BOOL bYield = FALSE ) // Setzt Flag, so daß nicht schon der nächste Befehl ausgeführt wird { nModalCount = Application::GetModalModeCount(); bIsInReschedule = TRUE; @@ -210,13 +210,13 @@ public: nModalCount = 0; } static BOOL MaybeResetSafeReschedule() - { // Implementierung muß hier zwar nicht sein, ist aber übersichtlicher so + { // Implementierung muß hier zwar nicht sein, ist aber übersichtlicher so if ( !bIsInReschedule ) return FALSE; if ( pLastFocusWindow != GetpApp()->GetFocusWindow() || ( Application::GetModalModeCount() > nModalCount ) -// || ( DragManager::GetDragManager() && !bWasDragManager ) +// || ( DragManager::GetDragManager() && !bWasDragManager ) || ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu ) || ( StarBASIC::IsRunning() && !bBasicWasRunning ) ) { @@ -227,7 +227,7 @@ public: else return FALSE; } - static void NormalReschedule() // Setzt das flag nicht + static void NormalReschedule() // Setzt das flag nicht { GetpApp()->Reschedule(); } @@ -290,15 +290,15 @@ public: static RetStream *pRet; static BOOL IsError; static BOOL bDying; - static BOOL bExecuting; // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben - BOOL bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt - static SmartId aSubMenuId1; // Untermenüs bei PopupMenus - static SmartId aSubMenuId2; // erstmal 2-Stufig - static SmartId aSubMenuId3; // and now even 3 levels #i31512# + static BOOL bExecuting; // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben + BOOL bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt + static SmartId aSubMenuId1; // Untermenüs bei PopupMenus + static SmartId aSubMenuId2; // erstmal 2-Stufig + static SmartId aSubMenuId3; // and now even 3 levels #i31512# static SystemWindow *pMenuWindow; // when using MenuBar as base for MenuCommands - static TTProperties *pTTProperties; // Hier stehen die SlotIDs aus dem SFX drin + static TTProperties *pTTProperties; // Hier stehen die SlotIDs aus dem SFX drin - BOOL CheckWindowWait(); //True heisst, dass Window noch existiert + BOOL CheckWindowWait(); //True heisst, dass Window noch existiert //False -> Window weg; static void SetFirstDocFrame( Window* pWin ); static Window* GetFirstDocFrame(); @@ -318,7 +318,7 @@ public: #endif }; -class StatementSlot : public StatementList //Slots aufrufen +class StatementSlot : public StatementList //Slots aufrufen { protected: USHORT nAnzahl; @@ -337,13 +337,13 @@ public: virtual BOOL Execute(); }; -class StatementUnoSlot : public StatementSlot //Uno Slots aufrufen +class StatementUnoSlot : public StatementSlot //Uno Slots aufrufen { public: StatementUnoSlot(SCmdStream *pIn); }; -class StatementCommand : public StatementList // Befehl ausführen (wintree, resetaplication ...) +class StatementCommand : public StatementList // Befehl ausführen (wintree, resetaplication ...) { friend class ImplRemoteControl; protected: @@ -405,7 +405,7 @@ public: }; -class StatementFlow : public StatementList // Kommunikation mit Sequence +class StatementFlow : public StatementList // Kommunikation mit Sequence { USHORT nArt; @@ -423,8 +423,8 @@ public: static CommunicationLink *pCommLink; static BOOL bSending; - static BOOL bUseIPC; // Soll zur rückmeldung IPC verwendet werden? - static ImplRemoteControl *pRemoteControl; // Static für 2. Constructor + static BOOL bUseIPC; // Soll zur rückmeldung IPC verwendet werden? + static ImplRemoteControl *pRemoteControl; // Static für 2. Constructor private: void SendViaSocket(); diff --git a/automation/source/server/svcommstream.cxx b/automation/source/server/svcommstream.cxx index c689f9137a3f..9258a6472cff 100644 --- a/automation/source/server/svcommstream.cxx +++ b/automation/source/server/svcommstream.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/source/server/testtool.hrc b/automation/source/server/testtool.hrc index d6a234b74236..e8d1c04ac699 100644 --- a/automation/source/server/testtool.hrc +++ b/automation/source/server/testtool.hrc @@ -1,7 +1,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 @@ -24,32 +24,32 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TTSTART 12345 +#define TTSTART 12345 -#define DisplayHidToolBox ( TTSTART + 0 ) -#define TT_SHOW 1 -#define TT_SHOW2 ( TTSTART + 1 ) -#define TT_OUTPUT 3 -#define TT_SEND_DATA 4 -#define TT_ALLWIN 5 -#define TT_KURZNAME 6 -#define TT_LANGNAME 7 +#define DisplayHidToolBox ( TTSTART + 0 ) +#define TT_SHOW 1 +#define TT_SHOW2 ( TTSTART + 1 ) +#define TT_OUTPUT 3 +#define TT_SEND_DATA 4 +#define TT_ALLWIN 5 +#define TT_KURZNAME 6 +#define TT_LANGNAME 7 #define TT_ALTERNATE_CAPTION ( TTSTART + 2 ) #define TT_INLINE_TRANSLATION ( TTSTART + 3) -#define TT_GB_TRANSLATION 1 -#define TT_E_NEW 2 -#define TT_FT_OLD 3 -#define TT_GB_COMMENT 4 -#define TT_E_COMMENT 5 +#define TT_GB_TRANSLATION 1 +#define TT_E_NEW 2 +#define TT_FT_OLD 3 +#define TT_GB_COMMENT 4 +#define TT_E_COMMENT 5 -#define TT_PB_SELECT 6 -#define TT_PB_RESTORE 7 -#define TT_PB_ACCEPT 8 -#define TT_PB_NEXT 9 +#define TT_PB_SELECT 6 +#define TT_PB_RESTORE 7 +#define TT_PB_ACCEPT 8 +#define TT_PB_NEXT 9 #define TT_DISCARD_CHANGED_DATA ( TTSTART + 4 ) -#define TT_NO_CONTROL ( TTSTART + 5 ) +#define TT_NO_CONTROL ( TTSTART + 5 ) -#define TT_GPF ( TTSTART + 6 ) +#define TT_GPF ( TTSTART + 6 ) diff --git a/automation/source/simplecm/communiio.hxx b/automation/source/simplecm/communiio.hxx index c0625ed8b2c6..e5c623f6ebb8 100644 --- a/automation/source/simplecm/communiio.hxx +++ b/automation/source/simplecm/communiio.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,18 +28,18 @@ /************************************************************************* * - * 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! * ************************************************************************/ #include <automation/commtypes.hxx> -#define C_ERROR_NONE 0x0001 -#define C_ERROR_PERMANENT 0x0002 -#define C_ERROR_RETRY 0x0003 -#define C_ERROR_TIMEOUT 0x0004 +#define C_ERROR_NONE 0x0001 +#define C_ERROR_PERMANENT 0x0002 +#define C_ERROR_RETRY 0x0003 +#define C_ERROR_TIMEOUT 0x0004 class ITransmiter { diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx index 034143d2cba6..3f0e4125372c 100644 --- a/automation/source/simplecm/packethandler.cxx +++ b/automation/source/simplecm/packethandler.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 @@ -31,9 +31,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! * ************************************************************************/ @@ -98,7 +98,7 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen ) if ( bWasError ) return FALSE; - if ( 0xFFFFFFFF == nBytes ) // Expliziter Request für dieses Datenpaket auf MultiChannel umzuschalten + if ( 0xFFFFFFFF == nBytes ) // Expliziter Request für dieses Datenpaket auf MultiChannel umzuschalten { READ_SOCKET( &nBytes, sizeof(nBytes) ) if ( bWasError ) @@ -210,13 +210,13 @@ comm_BOOL PacketHandler::TransferData( const void* pData, comm_UINT32 nLen, CMPr #ifndef FORCE_MULTI_CHANNEL_HEADERS if ( bMultiChannel ) #endif - nBuffer += 1+2+2+2; // für einen CH_SimpleMultiChannel + nBuffer += 1+2+2+2; // für einen CH_SimpleMultiChannel #ifdef FORCE_MULTI_CHANNEL_HEADERS if ( !bMultiChannel ) { comm_UINT32 n32; - n32 = 0xffffffff; // Umschalten auf MultiChannel + n32 = 0xffffffff; // Umschalten auf MultiChannel n32 = NETDWORD( n32 ); WRITE_SOCKET( &n32, 4 ); } @@ -237,11 +237,11 @@ comm_BOOL PacketHandler::TransferData( const void* pData, comm_UINT32 nLen, CMPr c = CalcCheckByte( nBuffer ); WRITE_SOCKET( &c, 1 ); - n16 = 4; // Länge des Headers für einen CH_SimpleMultiChannel + n16 = 4; // Länge des Headers für einen CH_SimpleMultiChannel n16 = NETWORD( n16 ); WRITE_SOCKET( &n16, 2 ); - n16 = CH_SimpleMultiChannel; // Typ des Headers + n16 = CH_SimpleMultiChannel; // Typ des Headers n16 = NETWORD( n16 ); WRITE_SOCKET( &n16, 2 ); @@ -259,40 +259,40 @@ comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void comm_UINT32 nBuffer = 0; -// if ( pMyManager->IsMultiChannel() ) Wir senden immer FFFFFFFF vorweg -> immer MultiChannel (Oder GPF bei älteren) - nBuffer += 1+2+2; // für einen CH_Handshake +// if ( pMyManager->IsMultiChannel() ) Wir senden immer FFFFFFFF vorweg -> immer MultiChannel (Oder GPF bei älteren) + nBuffer += 1+2+2; // für einen CH_Handshake - nBuffer += 2; // für den Typ des Handshakes + nBuffer += 2; // für den Typ des Handshakes switch ( aHandshakeType ) { case CH_REQUEST_HandshakeAlive: - nBuffer += 0; // Keine extra Daten + nBuffer += 0; // Keine extra Daten break; case CH_RESPONSE_HandshakeAlive: - nBuffer += 0; // Keine extra Daten + nBuffer += 0; // Keine extra Daten break; case CH_REQUEST_ShutdownLink: - nBuffer += 0; // Keine extra Daten + nBuffer += 0; // Keine extra Daten break; case CH_ShutdownLink: - nBuffer += 0; // Keine extra Daten + nBuffer += 0; // Keine extra Daten break; case CH_SUPPORT_OPTIONS: - nBuffer += 2 ; // one word extradata for options + nBuffer += 2 ; // one word extradata for options break; case CH_SetApplication: - nBuffer += 0 ; // one word extradata for options + nBuffer += 0 ; // one word extradata for options break; default: DBG_ERROR("Unknown HandshakeType"); } if ( pData ) - nBuffer += nLen; // Extra data in Buffer + nBuffer += nLen; // Extra data in Buffer comm_UINT32 n32; - n32 = 0xffffffff; // Umschalten auf MultiChannel + n32 = 0xffffffff; // Umschalten auf MultiChannel n32 = NETDWORD( n32 ); WRITE_SOCKET( &n32, 4 ); @@ -306,15 +306,15 @@ comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void c = CalcCheckByte( nBuffer ); WRITE_SOCKET( &c, 1 ); - n16 = 2; // Länge des Headers für einen CH_Handshake + n16 = 2; // Länge des Headers für einen CH_Handshake n16 = NETWORD( n16 ); WRITE_SOCKET( &n16, 2 ); - n16 = CH_Handshake; // Typ des Headers + n16 = CH_Handshake; // Typ des Headers n16 = NETWORD( n16 ); WRITE_SOCKET( &n16, 2 ); - n16 = aHandshakeType; // Typ des Handshakes + n16 = aHandshakeType; // Typ des Handshakes n16 = NETWORD( n16 ); WRITE_SOCKET( &n16, 2 ); diff --git a/automation/source/simplecm/packethandler.hxx b/automation/source/simplecm/packethandler.hxx index 31081b2e949a..7f42a614b985 100644 --- a/automation/source/simplecm/packethandler.hxx +++ b/automation/source/simplecm/packethandler.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! * ************************************************************************/ @@ -62,7 +62,7 @@ public: comm_UINT16 GetReceiveProtocol() { return nReceiveProtocol; } comm_UINT16 GetReceiveHeaderType() { return nReceiveHeaderType; } - comm_BOOL ReceiveData( void* &pData, comm_UINT32 &nLen ); /// Recieve DataPacket from Socket + comm_BOOL ReceiveData( void* &pData, comm_UINT32 &nLen ); /// Recieve DataPacket from Socket virtual comm_BOOL SendHandshake( HandshakeType aHandshakeType, const void* pData = NULL, comm_UINT32 nLen = 0 ); virtual comm_BOOL TransferData( const void* pData, comm_UINT32 nLen, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE ); }; diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx index 26c8d6af0585..ef770100ddca 100644 --- a/automation/source/simplecm/simplecm.cxx +++ b/automation/source/simplecm/simplecm.cxx @@ -168,8 +168,8 @@ void SimpleCommunicationLinkViaSocket::SetStreamSocket( osl::StreamSocket* pSock BOOL SimpleCommunicationLinkViaSocket::StopCommunication() { - CommunicationLinkRef rHold(this); // avoid deleting this link before the end of the method - if ( !IsCommunicationError() ) // Meaning that the Communication is still runnung + CommunicationLinkRef rHold(this); // avoid deleting this link before the end of the method + if ( !IsCommunicationError() ) // Meaning that the Communication is still runnung { #if OSL_DEBUG_LEVEL > 1 debug_printf("Sending REQUEST_ShutdownLink\n"); @@ -250,7 +250,7 @@ ByteString SimpleCommunicationLinkViaSocket::GetMyName( CM_NameType eType ) SvStream* SimpleCommunicationLinkViaSocket::GetBestCommunicationStream() { SvStream* pStream = new SvMemoryStream; -// pStream->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); +// pStream->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); return pStream; } @@ -319,7 +319,7 @@ BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeTy ShutdownCommunication(); } else - { // set new status + { // set new status switch ( aHandshakeType ) { case CH_REQUEST_HandshakeAlive: @@ -366,7 +366,7 @@ bool SimpleCommunicationLinkViaSocket::IsReceiveReady() void SimpleCommunicationLinkViaSocketWithReceiveCallbacks::WaitForShutdown() { - CommunicationLinkRef rHold(this); // avoid deleting this link before the end of the method + CommunicationLinkRef rHold(this); // avoid deleting this link before the end of the method while( pMyManager && !IsCommunicationError() && IsReceiveReady()) ReceiveDataStream(); @@ -443,7 +443,7 @@ ByteString CommunicationManager::GetMyName( CM_NameType ) void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL ) { - pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden + pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden pCL->aStart = DateTime(); pCL->aLastAccess = pCL->aStart; bIsCommunicationRunning = TRUE; @@ -460,7 +460,7 @@ void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL ) void CommunicationManager::CallConnectionClosed( CommunicationLink* pCL ) { - pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden + pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden pCL->aLastAccess = DateTime(); INFO_MSG( CByteString("C-:").Append( pCL->GetCommunicationPartner( CM_FQDN ) ), @@ -472,14 +472,14 @@ void CommunicationManager::CallConnectionClosed( CommunicationLink* pCL ) xLastNewLink.Clear(); pCL->FinishCallback(); -// delete pCL; +// delete pCL; } void CommunicationManager::CallDataReceived( CommunicationLink* pCL ) { - pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden + pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden pCL->aLastAccess = DateTime(); - CommunicationLinkRef rHold(pCL); // Hält den Zeiger bis zum Ende des calls + CommunicationLinkRef rHold(pCL); // Hält den Zeiger bis zum Ende des calls // should be impossible but happens for mysterious reasons if ( !pCL->pServiceData ) @@ -494,7 +494,7 @@ void CommunicationManager::CallDataReceived( CommunicationLink* pCL ) { SvStream *pData = pCL->GetServiceData(); USHORT nType; - pData->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); // Unfortulately it is written this way :(( + pData->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); // Unfortulately it is written this way :(( *pData >> nType; pData->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); switch ( nType ) @@ -629,7 +629,7 @@ void SingleCommunicationManager::CallConnectionOpened( CommunicationLink* pCL ) if ( pInactiveLink ) pInactiveLink->InvalidateManager(); pInactiveLink = xActiveLink; - xActiveLink->StopCommunication(); // Den alten Link brutal abwürgen + xActiveLink->StopCommunication(); // Den alten Link brutal abwürgen } xActiveLink = pCL; CommunicationManager::CallConnectionOpened( pCL ); @@ -677,7 +677,7 @@ BOOL CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICo TimeValue aTV; - aTV.Seconds = 10; // Warte 10 Sekunden + aTV.Seconds = 10; // Warte 10 Sekunden aTV.Nanosec = 0; do { diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx index a860948c6b04..71d94993fbec 100644 --- a/automation/source/testtool/cmdstrm.cxx +++ b/automation/source/testtool/cmdstrm.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 @@ -65,14 +65,14 @@ CmdStream::~CmdStream() #define PUT_CHAR(ch) \ - USHORT nMCode = nModify + ch; \ - USHORT _Code = 1; \ - if ( (nMCode & 0xFF) == 0 ) \ - _Code |= 2; \ - if ( (nMCode >> 8) == 0 ) \ - _Code |= 4; \ - Result += (char) _Code; \ - Result += (char) ( nMCode & 0xFF ); \ + USHORT nMCode = nModify + ch; \ + USHORT _Code = 1; \ + if ( (nMCode & 0xFF) == 0 ) \ + _Code |= 2; \ + if ( (nMCode >> 8) == 0 ) \ + _Code |= 4; \ + Result += (char) _Code; \ + Result += (char) ( nMCode & 0xFF ); \ Result += (char) ( nMCode >> 8 ) @@ -90,7 +90,7 @@ String CmdStream::WandleKeyEventString( String aKeys ) if ( nPos2 != STRING_NOTFOUND ) { String Work = aKeys.Copy(nPos1+1,nPos2-nPos1+1-2); - aKeys.Erase(nPos1,nPos2-nPos1+1); // Inclusive Spitze Klammern weg + aKeys.Erase(nPos1,nPos2-nPos1+1); // Inclusive Spitze Klammern weg String Result, Token; USHORT nModify = 0; while ( Work.Len() > 0 ) @@ -122,21 +122,21 @@ String CmdStream::WandleKeyEventString( String aKeys ) { switch ( nCode ) { - case KEY_SPACE: Token = ' '; break; - case KEY_ADD: Token = '+'; break; - case KEY_SUBTRACT: Token = '-'; break; - case KEY_MULTIPLY: Token = '*'; break; - case KEY_DIVIDE: Token = '/'; break; - case KEY_POINT: Token = '.'; break; - case KEY_COMMA: Token = ','; break; - case KEY_LESS: Token = '<'; break; - case KEY_GREATER: Token = '>'; break; - case KEY_EQUAL: Token = '='; break; + case KEY_SPACE: Token = ' '; break; + case KEY_ADD: Token = '+'; break; + case KEY_SUBTRACT: Token = '-'; break; + case KEY_MULTIPLY: Token = '*'; break; + case KEY_DIVIDE: Token = '/'; break; + case KEY_POINT: Token = '.'; break; + case KEY_COMMA: Token = ','; break; + case KEY_LESS: Token = '<'; break; + case KEY_GREATER: Token = '>'; break; + case KEY_EQUAL: Token = '='; break; default: -// if ( nModify == 0 ) -// Token.ToLower(); -// else -// Token.ToUpper(); +// if ( nModify == 0 ) +// Token.ToLower(); +// else +// Token.ToUpper(); ; } Result += Token; @@ -181,7 +181,7 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString ) { switch (rPar->Get( i )->GetType()) { - case SbxLONG: // alles immer als Short �bertragen + case SbxLONG: // alles immer als Short �bertragen case SbxULONG: case SbxLONG64: case SbxULONG64: @@ -215,7 +215,7 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString ) else SbxBase::SetError( SbxERR_WRONG_ARGS ); break; - case SbxOBJECT: // whenever a control is passed. TabPage, MenuBar + case SbxOBJECT: // whenever a control is passed. TabPage, MenuBar { SbxProperty *pMember = NULL; if ( rPar->Get( i )->ISA( SbxObject ) ) @@ -296,15 +296,15 @@ void CmdStream::WriteSortedParams( SbxArray* rPar, BOOL IsKeyString ) } } Write (nParams); - if( nParams & PARAM_USHORT_1 ) Write( nNr1 ); - if( nParams & PARAM_USHORT_2 ) Write( nNr2 ); - if( nParams & PARAM_USHORT_3 ) Write( nNr3 ); - if( nParams & PARAM_USHORT_4 ) Write( nNr4 ); - if( nParams & PARAM_ULONG_1 ) Write( nLNr1 ); - if( nParams & PARAM_STR_1 ) Write( aString1, IsKeyString ); - if( nParams & PARAM_STR_2 ) Write( aString2, IsKeyString ); - if( nParams & PARAM_BOOL_1 ) Write( bBool1 ); - if( nParams & PARAM_BOOL_2 ) Write( bBool2 ); + if( nParams & PARAM_USHORT_1 ) Write( nNr1 ); + if( nParams & PARAM_USHORT_2 ) Write( nNr2 ); + if( nParams & PARAM_USHORT_3 ) Write( nNr3 ); + if( nParams & PARAM_USHORT_4 ) Write( nNr4 ); + if( nParams & PARAM_ULONG_1 ) Write( nLNr1 ); + if( nParams & PARAM_STR_1 ) Write( aString1, IsKeyString ); + if( nParams & PARAM_STR_2 ) Write( aString2, IsKeyString ); + if( nParams & PARAM_BOOL_1 ) Write( bBool1 ); + if( nParams & PARAM_BOOL_2 ) Write( bBool2 ); } void CmdStream::GenCmdCommand( USHORT nNr, SbxArray* rPar ) @@ -320,15 +320,15 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar ) Write(nNr); if (rPar) { - USHORT nAnz = (rPar->Count()-1) >> 1; // Geteilt durch 2 + USHORT nAnz = (rPar->Count()-1) >> 1; // Geteilt durch 2 Write(nAnz); BOOL bWriteUnoSlot = rPar->Get( 1 )->GetType() == SbxSTRING; for (USHORT n = 1 ; n <= nAnz ; n++) { /// #59513# nicht mehr ben�tigt -// ULONG nUserData = rPar->Get( 2*n-1 )->GetUserData(); -// rPar->Get( 2*n-1 )->SetUserData(ID_DoNothing); // Verhindert Ausf�hrung der Slots, die als Parameter �bergeben sind. +// ULONG nUserData = rPar->Get( 2*n-1 )->GetUserData(); +// rPar->Get( 2*n-1 )->SetUserData(ID_DoNothing); // Verhindert Ausf�hrung der Slots, die als Parameter �bergeben sind. if ( bWriteUnoSlot ) Write(rPar->Get( 2*n-1 )->GetString()); @@ -372,7 +372,7 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar ) } /// #59513# nicht mehr ben�tigt ( siehe oben ) -// rPar->Get( 2*n-1 )->SetUserData(nUserData); // Und wieder zur�cksetzen, so da� auch alles sauber ist. +// rPar->Get( 2*n-1 )->SetUserData(nUserData); // Und wieder zur�cksetzen, so da� auch alles sauber ist. } } else @@ -382,20 +382,20 @@ void CmdStream::GenCmdSlot( USHORT nNr, SbxArray* rPar ) void CmdStream::GenCmdUNOSlot( const String &aURL ) { Write( USHORT(SIUnoSlot) ); -/* Write( USHORT(0) ); // Hier wird im Office die SID_OPENURL Eingetragen. +/* Write( USHORT(0) ); // Hier wird im Office die SID_OPENURL Eingetragen. // Dies mu� nat�rlich im Office hart verdratet werden und nicht hier, // da sich die ID ja mal �ndern kann. // Da auch die ID f�r das PoolItem im Office entnommen werden mu� hier also kein PoolItem // gesendet werden. - Write( USHORT(0) ); // Anzahl PoolItems + Write( USHORT(0) ); // Anzahl PoolItems // Stattdessen wird noch eine extra String gesendet, der dann Officeseitig in ein // SfxStringItem mit entsprechender ID gewandelt wird. - Write( aURL ); // String f�r das PoolItem*/ + Write( aURL ); // String f�r das PoolItem*/ - Write( aURL ); // Die UNO URL eben + Write( aURL ); // Die UNO URL eben } void CmdStream::GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar ) @@ -418,14 +418,14 @@ void CmdStream::GenCmdFlow( USHORT nArt ) { Write(USHORT(SIFlow)); Write(nArt); - Write(USHORT(PARAM_NONE)); // Typ der folgenden Parameter + Write(USHORT(PARAM_NONE)); // Typ der folgenden Parameter } void CmdStream::GenCmdFlow( USHORT nArt, USHORT nNr1 ) { Write(USHORT(SIFlow)); Write(nArt); - Write(USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter + Write(USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter Write(nNr1); } @@ -433,7 +433,7 @@ void CmdStream::GenCmdFlow( USHORT nArt, comm_ULONG nNr1 ) { Write(USHORT(SIFlow)); Write(nArt); - Write(USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter + Write(USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nNr1); } @@ -441,7 +441,7 @@ void CmdStream::GenCmdFlow( USHORT nArt, String aString1 ) { Write(USHORT(SIFlow)); Write(nArt); - Write(USHORT(PARAM_STR_1)); // Typ der folgenden Parameter + Write(USHORT(PARAM_STR_1)); // Typ der folgenden Parameter Write(aString1); } diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx index fb8b49f6106e..a9eb8b876487 100644 --- a/automation/source/testtool/cmdstrm.hxx +++ b/automation/source/testtool/cmdstrm.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 @@ public: void GenCmdUNOSlot( const String &aURL ); void GenCmdControl( comm_ULONG nUId, USHORT nMethodId, SbxArray* rPar ); - void GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar ); + void GenCmdControl( String aUId, USHORT nMethodId, SbxArray* rPar ); void GenCmdFlow( USHORT nArt ); @@ -59,11 +59,11 @@ public: SvMemoryStream* GetStream(); - static CNames *pKeyCodes; // Namen der Sondertasten MOD1, F1, LEFT ... + static CNames *pKeyCodes; // Namen der Sondertasten MOD1, F1, LEFT ... static ControlDefLoad __READONLY_DATA arKeyCodes []; private: - String WandleKeyEventString( String aKeys ); // Nutzt pKeyCodes. <RETURN> <SHIFT LEFT LEFT> + String WandleKeyEventString( String aKeys ); // Nutzt pKeyCodes. <RETURN> <SHIFT LEFT LEFT> using CmdBaseStream::Write; void Write( comm_USHORT nNr ){CmdBaseStream::Write( nNr );} diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx index 8c206b108926..b33fa293fe5a 100644 --- a/automation/source/testtool/comm_bas.cxx +++ b/automation/source/testtool/comm_bas.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 @@ -43,21 +43,21 @@ // Keine // 2) Methoden: // CommunicationLink StartCommunication( Host, Port ) -// StopAllCommunication // Alle Kommunikation wird abgebrochen -// BOOL IsCommunicationRunning // Läuft noch irgendwas -// String GetMyName Der eigene Name -// BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig -// SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event +// StopAllCommunication // Alle Kommunikation wird abgebrochen +// BOOL IsCommunicationRunning // Läuft noch irgendwas +// String GetMyName Der eigene Name +// BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig +// SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event // Der CommunicationLink hat folgende Elemente: // 1) Properties: // Keine // 2) Methoden: -// StopCommunication Die Kommunikation wird abgebrochen -// String GetMyName Der eigene Name -// String GetHostName Der Name des Anderen -// Send(String ) String an den Partner schicken -// String GetString Ergebnis des letzten Empfangs +// StopCommunication Die Kommunikation wird abgebrochen +// String GetMyName Der eigene Name +// String GetHostName Der Name des Anderen +// Send(String ) String an den Partner schicken +// String GetString Ergebnis des letzten Empfangs // Diese Implementation ist ein Beispiel fuer eine tabellengesteuerte @@ -74,7 +74,7 @@ #define _BWRITE 0x0200 // kann as Lvalue verwendet werden #define _LVALUE _BWRITE // kann as Lvalue verwendet werden #define _READWRITE 0x0300 // beides -#define _OPT 0x0400 // TRUE: optionaler Parameter +#define _OPT 0x0400 // TRUE: optionaler Parameter #define _METHOD 0x1000 // Masken-Bit fuer eine Methode #define _PROPERTY 0x2000 // Masken-Bit fuer eine Property #define _COLL 0x4000 // Masken-Bit fuer eine Collection @@ -145,7 +145,7 @@ CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject( , m_bCatchOpen( FALSE ) , m_pNewLink( NULL ) { -// SetName( CUniString("Manager") ); +// SetName( CUniString("Manager") ); m_pMethods = &aManagerMethods[0]; m_pManager = new CommunicationManagerClientViaSocket; m_pManager->SetConnectionOpenedHdl( LINK( this, CommunicationWrapper, Open ) ); @@ -323,7 +323,7 @@ void CommunicationWrapper::Events( String aType, CommunicationLink* pLink ) Call( m_aEventHandlerName, pPar ); } else - delete pLink->GetServiceData(); // Stream wegschmeissen um nicht zu blockieren + delete pLink->GetServiceData(); // Stream wegschmeissen um nicht zu blockieren } @@ -352,28 +352,28 @@ void CommunicationWrapper::MStartCommunication( SbxVariable* pVar, SbxArray* pPa } void CommunicationWrapper::MStopAllCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) -{ // StopAllCommunication // Alle Kommunikation wird abgebrochen +{ // StopAllCommunication // Alle Kommunikation wird abgebrochen m_pManager->StopCommunication(); } void CommunicationWrapper::MIsCommunicationRunning( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) -{ // BOOL IsCommunicationRunning // Läuft noch irgendwas +{ // BOOL IsCommunicationRunning // Läuft noch irgendwas pVar->PutBool( m_pManager->IsCommunicationRunning() ); } void CommunicationWrapper::MGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) -{ // String GetMyName Der eigene Name +{ // String GetMyName Der eigene Name pVar->PutString( UniString( m_pManager->GetMyName( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) ); } void CommunicationWrapper::MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, BOOL /*bWrite*/ ) -{ // BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig +{ // BOOL IsLinkValid( CommunicationLink ) // Ist dieser Link noch gültig CommunicationWrapper *pWrapper = (CommunicationWrapper*)(pPar->Get( 1 )->GetObject()); pVar->PutBool( m_pManager->IsLinkValid( pWrapper->GetCommunicationLink() ) ); } void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*bWrite*/ ) -{ // SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event +{ // SetCommunicationEventHandler( String ) // Diese Funktion wird aufgerufen bei jedem Event m_aEventHandlerName = pPar->Get( 1 )->GetString(); } @@ -381,24 +381,24 @@ void CommunicationWrapper::MSetCommunicationEventHandler( SbxVariable* /*pVar*/, -// Link +// Link void CommunicationWrapper::LStopCommunication( SbxVariable* /*pVar*/, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) -{ // StopCommunication Die Kommunikation wird abgebrochen +{ // StopCommunication Die Kommunikation wird abgebrochen m_pLink->StopCommunication(); } void CommunicationWrapper::LGetMyName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) -{ // String GetMyName Der eigene Name +{ // String GetMyName Der eigene Name pVar->PutString( UniString( m_pLink->GetMyName( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) ); } void CommunicationWrapper::LGetHostName( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) -{ // String GetHostName Der Name des Anderen +{ // String GetHostName Der Name des Anderen pVar->PutString( UniString( m_pLink->GetCommunicationPartner( CM_FQDN ), RTL_TEXTENCODING_UTF8 ) ); } void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /*bWrite*/ ) -{ // Send(String ) String an den Partner schicken +{ // Send(String ) String an den Partner schicken SvStream *pSendStream = m_pLink->GetBestCommunicationStream(); String aSendString = pPar->Get( 1 )->GetString(); pSendStream->WriteByteString( aSendString, RTL_TEXTENCODING_UTF8 ); @@ -407,7 +407,7 @@ void CommunicationWrapper::LSend( SbxVariable* /*pVar*/, SbxArray* pPar, BOOL /* } void CommunicationWrapper::LGetString( SbxVariable* pVar, SbxArray* /*pPar*/, BOOL /*bWrite*/ ) -{ // String GetString Ergebnis des letzten Empfangs +{ // String GetString Ergebnis des letzten Empfangs SvStream *pReceiveStream = m_pLink->GetServiceData(); if ( pReceiveStream ) { diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx index 3587efcc4806..ce994324f889 100644 --- a/automation/source/testtool/comm_bas.hxx +++ b/automation/source/testtool/comm_bas.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 @@ -36,7 +36,7 @@ class CommunicationManagerClientViaSocket; class CommunicationLink; -class CommunicationWrapper : public SbxObject // Einer für Manager und Links +class CommunicationWrapper : public SbxObject // Einer für Manager und Links { // Definition eines Tabelleneintrags. Dies wird hier gemacht, // da dadurch die Methoden und Properties als private deklariert @@ -51,17 +51,17 @@ private: #endif struct Methods { - const char* pName; // Name des Eintrags - SbxDataType eType; // Datentyp - pMeth pFunc; // Function Pointer - short nArgs; // Argumente und Flags + const char* pName; // Name des Eintrags + SbxDataType eType; // Datentyp + pMeth pFunc; // Function Pointer + short nArgs; // Argumente und Flags }; - static Methods aManagerMethods[]; // Methodentabelle - static Methods aLinkMethods[]; // Methodentabelle - Methods *m_pMethods; // Aktuelle Methodentabelle + static Methods aManagerMethods[]; // Methodentabelle + static Methods aLinkMethods[]; // Methodentabelle + Methods *m_pMethods; // Aktuelle Methodentabelle // Methoden - // Manager + // Manager void MStartCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); void MStopAllCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); void MIsCommunicationRunning( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); @@ -69,7 +69,7 @@ private: void MIsLinkValid( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); void MSetCommunicationEventHandler( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); - // Link + // Link void LStopCommunication( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); void LGetMyName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); void LGetHostName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite ); @@ -79,7 +79,7 @@ private: // Interne Member und Methoden CommunicationManagerClientViaSocket *m_pManager; CommunicationLink *m_pLink; - BOOL m_bIsManager; // Ist es kein Manager, so ist es ein Link + BOOL m_bIsManager; // Ist es kein Manager, so ist es ein Link // Kram für Manager DECL_LINK( Open, CommunicationLink* ); diff --git a/automation/source/testtool/cretstrm.cxx b/automation/source/testtool/cretstrm.cxx index 0f9781c73970..b07271b4b311 100644 --- a/automation/source/testtool/cretstrm.cxx +++ b/automation/source/testtool/cretstrm.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/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx index 206d74db33ba..7aa09a3d4c78 100644 --- a/automation/source/testtool/cretstrm.hxx +++ b/automation/source/testtool/cretstrm.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 @@ -45,7 +45,7 @@ public: using CmdBaseStream::Read; void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );} void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );} -// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );} +// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );} virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );} void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );} // new diff --git a/automation/source/testtool/filter.pl b/automation/source/testtool/filter.pl index 8f45073b0934..7542dea9ce41 100644 --- a/automation/source/testtool/filter.pl +++ b/automation/source/testtool/filter.pl @@ -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/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx index beb8f4c4d0d7..11c1e4d484b0 100644 --- a/automation/source/testtool/httprequest.cxx +++ b/automation/source/testtool/httprequest.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 @@ -91,13 +91,13 @@ BOOL HttpRequest::Execute() } TimeValue aTV; - aTV.Seconds = 10; // Warte 10 Sekunden + aTV.Seconds = 10; // Warte 10 Sekunden aTV.Nanosec = 0; pOutSocket = new osl::ConnectorSocket(); if ( pOutSocket->connect( aConnectAddr, &aTV ) == osl_Socket_Ok ) { -// pOutSocket->setTcpNoDelay( 1 ); +// pOutSocket->setTcpNoDelay( 1 ); } else { @@ -128,7 +128,7 @@ BOOL HttpRequest::Execute() SendString( pOutSocket, "Connection: Keep-Alive\n" ); } - + SendString( pOutSocket, "User-Agent: Mozilla/4.7 [de] (Linux; I)" ); SendString( pOutSocket, "Host: " ); SendString( pOutSocket, aRequestHost ); @@ -156,7 +156,7 @@ BOOL HttpRequest::Execute() pOutSocket->close(); pStream->Seek( 0 ); - + ByteString aLine; BOOL bInsideHeader = TRUE; while ( bInsideHeader ) diff --git a/automation/source/testtool/httprequest.hxx b/automation/source/testtool/httprequest.hxx index af8ad673a17d..02cc206dedcc 100644 --- a/automation/source/testtool/httprequest.hxx +++ b/automation/source/testtool/httprequest.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/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 8143700f7cd8..df6f22761355 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.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 @@ -104,7 +104,7 @@ static CommunicationFactory aComManFac; #define cMyDelim ' ' #define P_FEHLERLISTE pFehlerListe -#define KEEP_SEQUENCES 100 // Keep Names of last 100 Calls +#define KEEP_SEQUENCES 100 // Keep Names of last 100 Calls ControlDefLoad __READONLY_DATA Controls::arClasses [] = @@ -114,7 +114,7 @@ CNames *Controls::pClasses = NULL; ControlDefLoad __READONLY_DATA TestToolObj::arR_Cmds [] = #include "r_cmds.hxx" CNames *TestToolObj::pRCommands = NULL; -CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Testtools gespeichert +CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Testtools gespeichert DBG_NAME( ControlItem ) @@ -354,7 +354,7 @@ TestToolObj::TestToolObj( String aName, String aFilePath ) // Inter pImpl = new ImplTestToolObj; pImpl->ProgParam = String(); pImpl->aFileBase = DirEntry(aFilePath); -// pImpl->aLogFileBase = DirEntry(); +// pImpl->aLogFileBase = DirEntry(); pImpl->aHIDDir = DirEntry(aFilePath); pImpl->bIsStart = FALSE; pImpl->pMyBasic = NULL; @@ -395,17 +395,17 @@ TestToolObj::TestToolObj( String aName, MyBasic* pBas ) // Aufruf pCommunicationManager->SetDataReceivedHdl( LINK( this, TestToolObj, ReturnResultsLink )); } -void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den ConfigDialog ge�ndert werden k�nnen +void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den ConfigDialog ge�ndert werden k�nnen { -#define GETSET(aVar, KeyName, Dafault) \ - { \ - ByteString __##aVar##__; \ - __##aVar##__ = aConf.ReadKey(KeyName); \ - if ( !__##aVar##__.Len() ) \ - { \ - __##aVar##__ = Dafault; \ - aConf.WriteKey(KeyName, __##aVar##__); \ - } \ +#define GETSET(aVar, KeyName, Dafault) \ + { \ + ByteString __##aVar##__; \ + __##aVar##__ = aConf.ReadKey(KeyName); \ + if ( !__##aVar##__.Len() ) \ + { \ + __##aVar##__ = Dafault; \ + aConf.WriteKey(KeyName, __##aVar##__); \ + } \ aVar = UniString( __##aVar##__, RTL_TEXTENCODING_UTF8 );\ } @@ -541,7 +541,7 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d void TestToolObj::InitTestToolObj() { - pImpl->nNumBorders = 0; // F�r Profiling mit k�stchen + pImpl->nNumBorders = 0; // F�r Profiling mit k�stchen pImpl->nMinRemoteCommandDelay = 0; pImpl->nMaxRemoteCommandDelay = 0; @@ -597,8 +597,8 @@ void TestToolObj::InitTestToolObj() MAKE_TT_KEYWORD( "Kontext", SbxCLASS_METHOD, SbxNULL, ID_Kontext ); MAKE_TT_KEYWORD( "GetNextError", SbxCLASS_VARIABLE, SbxVARIANT, ID_GetError ); MAKE_TT_KEYWORD( "Start", SbxCLASS_METHOD, SbxSTRING, ID_Start ); -// pMeth = Make( "Kill", SbxCLASS_METHOD, SbxNULL ); -// pMeth->SetUserData( ID_Kill ); +// pMeth = Make( "Kill", SbxCLASS_METHOD, SbxNULL ); +// pMeth->SetUserData( ID_Kill ); /* pMeth = Make( "TestReset", SbxCLASS_METHOD, SbxNULL ); pMeth->SetUserData( ID_Reset );*/ MAKE_TT_KEYWORD( "Use", SbxCLASS_METHOD, SbxNULL, ID_Use ); @@ -615,11 +615,11 @@ void TestToolObj::InitTestToolObj() MAKE_TT_KEYWORD( "MaybeAddErr", SbxCLASS_METHOD, SbxNULL, ID_MaybeAddErr ); MAKE_TT_KEYWORD( "ClearError", SbxCLASS_METHOD, SbxNULL, ID_ClearError ); MAKE_TT_KEYWORD( "SaveIDs", SbxCLASS_METHOD, SbxBOOL, ID_SaveIDs ); - MAKE_TT_KEYWORD( "AutoExecute", SbxCLASS_PROPERTY, SbxBOOL, ID_AutoExecute ); // Achtung! PROPERTY Also eine Variable + MAKE_TT_KEYWORD( "AutoExecute", SbxCLASS_PROPERTY, SbxBOOL, ID_AutoExecute ); // Achtung! PROPERTY Also eine Variable MAKE_TT_KEYWORD( "Execute", SbxCLASS_METHOD, SbxNULL, ID_Execute ); MAKE_TT_KEYWORD( "StopOnSyntaxError", SbxCLASS_PROPERTY, SbxBOOL, ID_StopOnSyntaxError ); -/* Dialog Handler werden gebraucht, wenn im internen Testtool ein Dialog +/* Dialog Handler werden gebraucht, wenn im internen Testtool ein Dialog hochgerissen wird. Nach versenden der Remote-Kommandos wird IdleHandler aktiviert. Er testet, ob das Reschedule zum WaitForAnswer zur�ckkehrt. Bleibt das aus, so wird erst der RemoteHandler zur�ckgesetzt und dann die Handler-Sub im Basic @@ -1007,7 +1007,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B if (aShortname.CompareIgnoreCaseToAscii("*Active") == COMPARE_EQUAL) aUId = SmartId( UID_ACTIVE ); else if ( !bUnoName && !bMozillaName ) - { // Bestimmen der ID aus der Hid.Lst + { // Bestimmen der ID aus der Hid.Lst ControlDef WhatName(aLongname,SmartId()); if (pUIds->Seek_Entry(&WhatName,&nElement)) aUId = pUIds->GetObject(nElement)->pData->aUId; @@ -1253,7 +1253,7 @@ void TestToolObj::WaitForAnswer () while ( !bReturnOK && Ende > Time() ) { -// pTemp = PlugInApplication::GetPlugInApp()->GetReturnFromExecute(); +// pTemp = PlugInApplication::GetPlugInApp()->GetReturnFromExecute(); if ( pTemp ) { ReturnResults( pTemp ); @@ -1327,7 +1327,7 @@ void TestToolObj::SendViaSocket() if ( !pCommunicationManager->IsCommunicationRunning() ) { - // first try to run basic sub "startTheOffice" see i86540 + // first try to run basic sub "startTheOffice" see i86540 SbxVariable* pMeth = pImpl->pMyBasic->Find( CUniString( "startTheOffice" ), SbxCLASS_DONTCARE); if( !pImpl->bIsStart && pMeth && pMeth->ISA(SbxMethod) ) { @@ -1373,7 +1373,7 @@ void TestToolObj::EndBlock() { if (IsBlock) { - pImpl->LocalStarttime = Time::GetSystemTicks(); // Setzen der Anfangszeit f�r Performancemessung + pImpl->LocalStarttime = Time::GetSystemTicks(); // Setzen der Anfangszeit f�r Performancemessung In->GenCmdFlow (F_EndCommandBlock); @@ -1398,7 +1398,7 @@ void TestToolObj::EndBlock() SendViaSocket(); else { -// PlugInApplication::GetPlugInApp()->ExecuteRemoteStatements( In->GetStream() ); +// PlugInApplication::GetPlugInApp()->ExecuteRemoteStatements( In->GetStream() ); bReturnOK = FALSE; if ( aDialogHandlerName.Len() > 0 ) GetpApp()->InsertIdleHdl( LINK( this, TestToolObj, IdleHdl ), 1 ); @@ -1518,7 +1518,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { pNewDef->Sons(new CNames()); - pNewDef2 = new ControlDef(aName,aUId); // Noch einen machen + pNewDef2 = new ControlDef(aName,aUId); // Noch einen machen if (!pNewDef->SonInsert(pNewDef2)) // Dialog in eigenen Namespace eintragen { delete pNewDef2; @@ -1770,10 +1770,10 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, while ( pCommunicationManager->IsCommunicationRunning() ) Application::Reschedule(); - SingleCommandBlock = TRUE; // Bug 57188 + SingleCommandBlock = TRUE; // Bug 57188 IsBlock = FALSE; -// pCommunicationManager->StartCommunication(); +// pCommunicationManager->StartCommunication(); for (USHORT i=0;i<VAR_POOL_SIZE;i++) { @@ -2113,7 +2113,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, // Das ist total rotten und mu� wohl komplett neu!! -/* BOOL bWasBlock = IsBlock; +/* BOOL bWasBlock = IsBlock; if ( !IsBlock ) // Impliziter call bei Aufruf mit Methode if ( SingleCommandBlock ) BeginBlock(); @@ -2194,7 +2194,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, switch ( ((SbxTransportMethod*)pVar)->nValue ) { case RC_WinTree: -// ::svt::OStringTransfer::CopyString(pVar->GetString(), pSomeWindowIDontHave ); +// ::svt::OStringTransfer::CopyString(pVar->GetString(), pSomeWindowIDontHave ); break; } @@ -2290,9 +2290,9 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, // Hier wird der Remote UNO Kram gestartet // Eintrag in die Konfiguration unter // org.openoffice.Office.Common/Start/Connection - // socket,host=0,port=12345;iiop;XBla + // socket,host=0,port=12345;iiop;XBla // oder - // socket,host=0,port=12345;urp;;XBla + // socket,host=0,port=12345;urp;;XBla String aString; aString.AppendAscii( "socket,host=" ); @@ -2305,7 +2305,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, { Reference< XMultiServiceFactory > xSMgr = comphelper::getProcessServiceFactory(); // is allways there -/* if ( ! xSMgr.is() ) +/* if ( ! xSMgr.is() ) { xSMgr = ::cppu::createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), sal_True ); if ( xSMgr.is() ) @@ -2323,12 +2323,12 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, OUString(), OUString( RTL_CONSTASCII_USTRINGPARAM("urp") ), xConnection, Reference< XInstanceProvider >() ) ); - // Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ) ); + // Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ) ); Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ); - // Reference< XNamingService > xNamingService(xRet, UNO_QUERY); + // Reference< XNamingService > xNamingService(xRet, UNO_QUERY); - // Reference< XInterface > smgr = xNamingService->getRegisteredObject( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager" ) ) ); + // Reference< XInterface > smgr = xNamingService->getRegisteredObject( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager" ) ) ); smgr_xMultiserviceFactory = Reference< XMultiServiceFactory >(xRet, UNO_QUERY); //MBA fragen!! @@ -2345,7 +2345,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if( smgr_xMultiserviceFactory.is() ) { Any aAny; -// aAny <<= xBridge; +// aAny <<= xBridge; aAny <<= smgr_xMultiserviceFactory; SbxObjectRef xMySbxObj = GetSbUnoObject( CUniString("RemoteUnoAppFuerTesttool"), aAny ); @@ -2359,15 +2359,15 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, // Hier wird der Remote UNO Kram gestartet String aString; -// aString += GetHostConfig(); -// aString.AppendAscii( ":" ); -// aString += String::CreateFromInt32( GetUnoPortConfig() ); +// aString += GetHostConfig(); +// aString.AppendAscii( ":" ); +// aString += String::CreateFromInt32( GetUnoPortConfig() ); Reference< XMultiServiceFactory > xSMgr /* = comphelper::getProcessServiceFactory()*/; -// if ( ! xSMgr.is() ) +// if ( ! xSMgr.is() ) { xSMgr = ::cppu::createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\iserverproxy.rdb")), sal_True); -// comphelper::setProcessServiceFactory( xSMgr ); +// comphelper::setProcessServiceFactory( xSMgr ); } OUString aURL( aString ); @@ -2384,12 +2384,12 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("XIServerProxy")) ) ); -/* Reference< XIServerProxy > xIS( xRet, UNO_QUERY ); +/* Reference< XIServerProxy > xIS( xRet, UNO_QUERY ); if ( xIS.is() ) { String aHost( xIS->getIServerHost() ); -// Reference < XInformationClient > xIC = xIS->createIServerClient( "XInformationClient" ); +// Reference < XInformationClient > xIC = xIS->createIServerClient( "XInformationClient" ); Reference < XInformationClient > xIC = xIS->createInformationClient(); xIC->getTree(OUString::createFromAscii("r:\\b_server\\config\\stand.lst"), OUString() ); @@ -2419,7 +2419,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, { switch (rPar->Get( 1 )->GetType()) { - case SbxLONG: // alles immer als Short �bertragen + case SbxLONG: // alles immer als Short �bertragen case SbxULONG: case SbxLONG64: case SbxULONG64: @@ -2768,7 +2768,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( pImpl->nErrorCount ) { ADD_WARNING_LOG( GEN_RES_STR1( S_ERRORS_DETECTED, String::CreateFromInt32( pImpl->nErrorCount ) ) ); - pImpl->nWarningCount--; // Anpassen, da diese Warnung nicht in die Statistik soll + pImpl->nWarningCount--; // Anpassen, da diese Warnung nicht in die Statistik soll } else ADD_MESSAGE_LOG( GEN_RES_STR0( S_NO_ERRORS_DETECTED ) ); @@ -2901,7 +2901,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) delete pWhatName; pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), SmartId() ); if ( m_pSIds->Seek_Entry( pWhatName, &nElement ) ) - { // Nach slots suchen + { // Nach slots suchen SbxVariable *pReturn = new SbxVariable; delete pWhatName; pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) ); @@ -2961,13 +2961,13 @@ void TestToolObj::CalcPosition( String const &aSource, xub_StrLen nPos, xub_StrL } -#define CATCH_LABEL CUniString( "ctch" ) -#define CATCHRES_LABEL CUniString( "ctchres" ) -#define ENDCATCH_LABEL CUniString( "endctch" ) +#define CATCH_LABEL CUniString( "ctch" ) +#define CATCHRES_LABEL CUniString( "ctchres" ) +#define ENDCATCH_LABEL CUniString( "endctch" ) BOOL IsAlphaChar( sal_Unicode cChar ) { - return ( cChar >= 'a' && cChar <= 'z' ) || + return ( cChar >= 'a' && cChar <= 'z' ) || ( cChar >= 'A' && cChar <= 'Z' ); } @@ -3037,7 +3037,7 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_ xub_StrLen nTry2 = 0; while ( !WasPrecompilerError() && (nTry2 = ImplSearch( aSource, nStart, nEnd, CUniString("try"), nTry+1 )) != STRING_NOTFOUND ) - { // Wir rekursieren erstmal mit dem 2. Try + { // Wir rekursieren erstmal mit dem 2. Try if ( nTry2 < nCatch ) nEnd += PreCompilePart( aSource, nTry2, nEndcatch+8, aCatchLabel, nLabelCount ) - nEndcatch-8; else @@ -3060,7 +3060,7 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_ } String aReplacement; - int nTotalLength = -3 -5 -8; // try, catch und endcatch fallen raus + int nTotalLength = -3 -5 -8; // try, catch und endcatch fallen raus aReplacement.AppendAscii( "on error goto " ); aReplacement += aCatchLabel; @@ -3068,14 +3068,14 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_ nTotalLength += aReplacement.Len(); -// on error goto endcse -// goto endctchXX -// ctchXX: -// if err = 35 or err = 18 then : resume : endif : -// MaybeAddErr -// on error goto endcse -// resume ctchresXX -// ctchresXX: +// on error goto endcse +// goto endctchXX +// ctchXX: +// if err = 35 or err = 18 then : resume : endif : +// MaybeAddErr +// on error goto endcse +// resume ctchresXX +// ctchresXX: aReplacement.Erase(); aReplacement.AppendAscii( "on error goto " ); aReplacement += aFinalErrorLabel; @@ -3316,7 +3316,7 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive ) m_pReverseControls->DeleteAndDestroy( nNr ); // um VorlagenLaden/UntergeordneteIniDatei/SpeichernDlg/OrdnerDlg/OeffnenDlg/MessageBox/LetzteVersion/GrafikEinfuegenDlg/FarbeDlg/ExportierenDlg/DruckerEinrichten/DruckenDlg/DateiEinfuegenDlg/Active zu verhindern } -/* if ( m_pReverseControlsSon->Seek_Entry( pZeroItem, &nNr ) ) +/* if ( m_pReverseControlsSon->Seek_Entry( pZeroItem, &nNr ) ) { m_pReverseControlsSon->DeleteAndDestroy( nNr ); // um VorlagenLaden/UntergeordneteIniDatei/SpeichernDlg/OrdnerDlg/OeffnenDlg/MessageBox/LetzteVersion/GrafikEinfuegenDlg/FarbeDlg/ExportierenDlg/DruckerEinrichten/DruckenDlg/DateiEinfuegenDlg/Active zu verhindern @@ -3413,9 +3413,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) else pImpl->pNextReturn->PutULong( nLNr1 ); } - if( nParams & PARAM_USHORT_1 ) pImpl->pNextReturn->PutUShort( nNr1 ); - if( nParams & PARAM_STR_1 ) pImpl->pNextReturn->PutString( aString1 ); - if( nParams & PARAM_BOOL_1 ) pImpl->pNextReturn->PutBool( bBool1 ); + if( nParams & PARAM_USHORT_1 ) pImpl->pNextReturn->PutUShort( nNr1 ); + if( nParams & PARAM_STR_1 ) pImpl->pNextReturn->PutString( aString1 ); + if( nParams & PARAM_BOOL_1 ) pImpl->pNextReturn->PutBool( bBool1 ); if( nParams & PARAM_SBXVALUE_1 ) { SbxValues aValues( SbxDATE ); @@ -3550,7 +3550,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { switch ( nUId ) { - case S_ProfileReset: // nLNr1 = Anzahl Borders + case S_ProfileReset: // nLNr1 = Anzahl Borders { pImpl->nNumBorders = (USHORT)nLNr1; // Borders are 0 to 4 USHORT i; @@ -3565,15 +3565,15 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } break; } - case S_ProfileBorder1: // nLNr1 = Border1 in ms - case S_ProfileBorder2: // nLNr1 = Border2 in ms - case S_ProfileBorder3: // nLNr1 = Border3 in ms - case S_ProfileBorder4: // nLNr1 = Border4 in ms + case S_ProfileBorder1: // nLNr1 = Border1 in ms + case S_ProfileBorder2: // nLNr1 = Border2 in ms + case S_ProfileBorder3: // nLNr1 = Border3 in ms + case S_ProfileBorder4: // nLNr1 = Border4 in ms { pImpl->naValBorders[ nUId - S_ProfileBorder1 ] = nLNr1; break; } - case S_ProfileTime: // nLNr1 = remote Zeit des Befehls + case S_ProfileTime: // nLNr1 = remote Zeit des Befehls { USHORT i; for ( i=0 ; i<pImpl->nNumBorders && @@ -3601,9 +3601,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) break; } - case S_ProfileDump: // Gibt die daten aus. + case S_ProfileDump: // Gibt die daten aus. { - if ( pImpl->nNumBorders == 0 ) // Also keine alte R�ckmeldung vom Office + if ( pImpl->nNumBorders == 0 ) // Also keine alte R�ckmeldung vom Office break; DirEntry FilePath = pImpl->aLogFileBase + DirEntry(DirEntry(aLogFileName).GetBase().AppendAscii(".prf")); SvFileStream aStrm( FilePath.GetFull(), STREAM_STD_WRITE ); @@ -3671,8 +3671,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) case S_AssertError: { ADD_ASSERTION_LOG( aString1 ); -// ADD_ERROR_LOG( aString1, aRun.GetModuleName(SbxNAME_SHORT_TYPES), -// aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2() ); +// ADD_ERROR_LOG( aString1, aRun.GetModuleName(SbxNAME_SHORT_TYPES), +// aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2() ); } break; case S_QAError: @@ -4121,11 +4121,11 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl ) { - if ( rSymbol.CompareToAscii( "try" ) == COMPARE_EQUAL - || rSymbol.CompareToAscii( "catch" ) == COMPARE_EQUAL - || rSymbol.CompareToAscii( "endcatch" ) == COMPARE_EQUAL - || rSymbol.CompareToAscii( "testcase" ) == COMPARE_EQUAL - || rSymbol.CompareToAscii( "endcase" ) == COMPARE_EQUAL ) + if ( rSymbol.CompareToAscii( "try" ) == COMPARE_EQUAL + || rSymbol.CompareToAscii( "catch" ) == COMPARE_EQUAL + || rSymbol.CompareToAscii( "endcatch" ) == COMPARE_EQUAL + || rSymbol.CompareToAscii( "testcase" ) == COMPARE_EQUAL + || rSymbol.CompareToAscii( "endcase" ) == COMPARE_EQUAL ) { return TT_KEYWORD; } @@ -4175,7 +4175,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl ) return TT_LOCALCMD; } - return SB_SYMBOL; // Alles was hier landet ist vom Typ SB_SYMBOL und bleibt es auch + return SB_SYMBOL; // Alles was hier landet ist vom Typ SB_SYMBOL und bleibt es auch } @@ -4247,9 +4247,9 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType) String TTFormat::ms2s( ULONG nMilliSeconds ) { - if ( nMilliSeconds < 100000 ) // 100 Sekunden + if ( nMilliSeconds < 100000 ) // 100 Sekunden return String::CreateFromInt64( nMilliSeconds ); - if ( nMilliSeconds < 100000*60 ) // 100 Minuten + if ( nMilliSeconds < 100000*60 ) // 100 Minuten return String::CreateFromInt32( nMilliSeconds / 1000 ).AppendAscii("Sec"); return String::CreateFromInt32( nMilliSeconds / 1000 / 60 ).AppendAscii("Min"); } diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx index f60732b5d3fa..b2478d3a85e7 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.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 @@ -41,39 +41,39 @@ #include <map> -// #define ID_BeginBlock 1 -// #define ID_EndBlock 2 -#define ID_Kontext 3 -#define ID_GetError 4 -#define ID_ErrorDummy 5 // Intern zum Behandlen von Fehlenden Controls und Methoden -#define ID_RecordError 6 -#define ID_Start 7 -//#define ID_Kill 8 -//#define ID_Reset 9 -// #define ID_AppAbort 10 -#define ID_Dispatch 11 -#define ID_UNODispatch 12 -#define ID_Control 13 -#define ID_StartUse 14 -#define ID_Use 15 -#define ID_FinishUse 16 -#define ID_CaseLog 17 -#define ID_ExceptLog 18 -#define ID_PrintLog 19 -#define ID_WarnLog 20 -#define ID_ErrorLog 21 +// #define ID_BeginBlock 1 +// #define ID_EndBlock 2 +#define ID_Kontext 3 +#define ID_GetError 4 +#define ID_ErrorDummy 5 // Intern zum Behandlen von Fehlenden Controls und Methoden +#define ID_RecordError 6 +#define ID_Start 7 +//#define ID_Kill 8 +//#define ID_Reset 9 +// #define ID_AppAbort 10 +#define ID_Dispatch 11 +#define ID_UNODispatch 12 +#define ID_Control 13 +#define ID_StartUse 14 +#define ID_Use 15 +#define ID_FinishUse 16 +#define ID_CaseLog 17 +#define ID_ExceptLog 18 +#define ID_PrintLog 19 +#define ID_WarnLog 20 +#define ID_ErrorLog 21 #define ID_EnableQaErrors 22 -#define ID_QAErrorLog 23 -#define ID_MaybeAddErr 24 -#define ID_ClearError 25 -#define ID_GetNextCloseWindow 26 +#define ID_QAErrorLog 23 +#define ID_MaybeAddErr 24 +#define ID_ClearError 25 +#define ID_GetNextCloseWindow 26 #define ID_RemoteCommand 27 -#define ID_SaveIDs 28 -#define ID_AutoExecute 29 -#define ID_Execute 30 +#define ID_SaveIDs 28 +#define ID_AutoExecute 29 +#define ID_Execute 30 #define ID_DialogHandler 31 -#define ID_GetUnoApp 32 -#define ID_GetIServer 33 +#define ID_GetUnoApp 32 +#define ID_GetIServer 33 #define ID_RemoteCommandDelay 34 #define ID_GetApplicationPath 35 #define ID_GetCommonApplicationPath 36 @@ -121,7 +121,7 @@ public: ControlItem( const char *Name, SmartId aUIdP ); ControlItem( const String &Name, SmartId aUIdP ); -// ControlItem( const String &Name, const String &URL, const URLType aType ); +// ControlItem( const String &Name, const String &URL, const URLType aType ); // ControlItem( const String &Name, const String &URL, const ULONG nUId ); // ControlItem( const char *Name, const String &URL, const ULONG nUId ); ControlItem( ControlData *pDataP ); @@ -131,7 +131,7 @@ DBG_DTOR(ControlItem,0); } virtual BOOL operator < (const ControlItem &rPar)=0; virtual BOOL operator == (const ControlItem &rPar)=0; -// void Write( SvStream &aStream ); +// void Write( SvStream &aStream ); }; SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10) @@ -144,12 +144,12 @@ SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10) class ControlSon { protected: - CNames *pSons; // um sicherzustelle, daß nur Söhne des richtien Type reinkommen + CNames *pSons; // um sicherzustelle, daß nur Söhne des richtien Type reinkommen public: ControlSon() : pSons( NULL ) {}; ~ControlSon(); -// void Write( SvStream &aStream ); +// void Write( SvStream &aStream ); USHORT Son_Count() { return pSons->Count(); } void Sons( CNames *pNewSons ) { pSons = pNewSons; } @@ -162,10 +162,10 @@ public: ControlItemSon(const char *Name, SmartId aUIdP ) : ControlItem( Name, aUIdP ) {} ControlItemSon(const String &Name, SmartId aUIdP ); -// ControlItemSon(const String &Name, const String &URL, const URLType aType ); +// ControlItemSon(const String &Name, const String &URL, const URLType aType ); // ControlItemSon(const String &Name, const String &URL, const ULONG nUId ); // ControlItemSon(const char *Name, const String &URL, const ULONG nUId ); -// void Write( SvStream &aStream ); +// void Write( SvStream &aStream ); }; class ControlDef : public ControlItemSon @@ -174,7 +174,7 @@ public: ControlDef(const char *Name, SmartId aUIdP ) : ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);} ControlDef(const String &Name, SmartId aUIdP ); -// ControlDef(const String &Name, const String &URL, const URLType aType ); +// ControlDef(const String &Name, const String &URL, const URLType aType ); ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE ); ~ControlDef() {DBG_DTOR(ControlDef,0);} virtual BOOL operator < (const ControlItem &rPar); @@ -234,7 +234,7 @@ public: void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ); virtual SbxVariable* Find( const String&, SbxClassType ); - SbxTransportMethodRef pMethodVar; // zum Transport von Find nach Notify + SbxTransportMethodRef pMethodVar; // zum Transport von Find nach Notify static CNames *pClasses; static ControlDefLoad __READONLY_DATA arClasses []; }; @@ -245,18 +245,18 @@ typedef std::map< String, String > Environment; class ImplTestToolObj { public: -// ImplTestToolObj() -// ~ImplTestToolObj() +// ImplTestToolObj() +// ~ImplTestToolObj() - String ProgParam; // Parameter der zu Testenden APP; Gesetzt über Start + String ProgParam; // Parameter der zu Testenden APP; Gesetzt über Start - DirEntry aFileBase; // Grundpfad für die *.sid und *.win Dateien (Aus Configdatei) - DirEntry aLogFileBase; // Grundpfad für die *.res Dateien (Aus Configdatei) - DirEntry aHIDDir; // Verzeichnis, in dem die hid.lst gesucht wird + DirEntry aFileBase; // Grundpfad für die *.sid und *.win Dateien (Aus Configdatei) + DirEntry aLogFileBase; // Grundpfad für die *.res Dateien (Aus Configdatei) + DirEntry aHIDDir; // Verzeichnis, in dem die hid.lst gesucht wird - SbxTransportMethodRef pNextReturn; // Verweis auf die Var, die den Returnwert aufnimmt. + SbxTransportMethodRef pNextReturn; // Verweis auf die Var, die den Returnwert aufnimmt. - ControlsRef pControlsObj; // Jeweiliges Objekt, an dem Methoden aufgerufen weden. + ControlsRef pControlsObj; // Jeweiliges Objekt, an dem Methoden aufgerufen weden. #define VAR_POOL_SIZE 8 SbxTransportMethodRef pMyVars[VAR_POOL_SIZE]; // Falls in Ausdrücken mehrere verwendet werden @@ -276,7 +276,7 @@ public: ULONG nMaxRemoteCommandDelay; BOOL bDoRemoteCommandDelay; - BOOL bLnaguageExtensionLoaded; // Wurde über 'use' was geladen? Für syntax highlighting + BOOL bLnaguageExtensionLoaded; // Wurde über 'use' was geladen? Für syntax highlighting SfxBroadcaster *pTTSfxBroadcaster; ULONG nErrorCount; @@ -316,89 +316,89 @@ public: #define ADD_TO_LOG( aLogTypep, aMsgp, aFilenamep, nLinep, nCol1p, nCol2p, aRevisionp, pLogList )\ -{ \ - TTLogMsg *pLogMsg = new TTLogMsg(); \ - pLogMsg->aDebugData.aMsg = aMsgp; \ - pLogMsg->aLogFileName = (pImpl->aLogFileBase + DirEntry(aLogFileName)).GetFull(); \ - pLogMsg->aDebugData.aFilename = aFilenamep; \ - pLogMsg->aDebugData.nLine = nLinep; \ - pLogMsg->aDebugData.nCol1 = nCol1p; \ - pLogMsg->aDebugData.nCol2 = nCol2p; \ - pLogMsg->aDebugData.aLogType = aLogTypep; \ - aLogHdl.Call( pLogMsg ); \ +{ \ + TTLogMsg *pLogMsg = new TTLogMsg(); \ + pLogMsg->aDebugData.aMsg = aMsgp; \ + pLogMsg->aLogFileName = (pImpl->aLogFileBase + DirEntry(aLogFileName)).GetFull(); \ + pLogMsg->aDebugData.aFilename = aFilenamep; \ + pLogMsg->aDebugData.nLine = nLinep; \ + pLogMsg->aDebugData.nCol1 = nCol1p; \ + pLogMsg->aDebugData.nCol2 = nCol2p; \ + pLogMsg->aDebugData.aLogType = aLogTypep; \ + aLogHdl.Call( pLogMsg ); \ void* pDummyForWarningAboutNULL = pLogList; \ - if( pDummyForWarningAboutNULL ) \ - { \ - SbxDimArray* pLogArray = (SbxDimArray*)pLogList; \ - SbxVariable* pLogLine = new SbxVariable( SbxSTRING ); \ - String aCollect; \ - aCollect.Append( pLogMsg->aDebugData.aFilename ); \ - aCollect.AppendAscii( ";" ); \ - aCollect.Append( String::CreateFromInt32( nLinep ) ); \ - aCollect.AppendAscii( ";" ); \ - aCollect.Append( aRevisionp ); \ - aCollect.AppendAscii( ";" ); \ - aCollect.Append( pLogMsg->aDebugData.aMsg ); \ - pLogLine->PutString( aCollect ); \ - pLogArray->Insert( pLogLine, pLogArray->Count() ); \ - } \ - delete pLogMsg; \ -} \ - - -#define ADD_RUN_LOG() \ - ADD_TO_LOG(LOG_RUN, String(), String(), 0, 0, 0, String(), NULL) \ - -#define ADD_ERROR_LOG(aMsg, aFilename, nLine, nCol1, nCol2, aRevision) \ -{ \ + if( pDummyForWarningAboutNULL ) \ + { \ + SbxDimArray* pLogArray = (SbxDimArray*)pLogList; \ + SbxVariable* pLogLine = new SbxVariable( SbxSTRING ); \ + String aCollect; \ + aCollect.Append( pLogMsg->aDebugData.aFilename ); \ + aCollect.AppendAscii( ";" ); \ + aCollect.Append( String::CreateFromInt32( nLinep ) ); \ + aCollect.AppendAscii( ";" ); \ + aCollect.Append( aRevisionp ); \ + aCollect.AppendAscii( ";" ); \ + aCollect.Append( pLogMsg->aDebugData.aMsg ); \ + pLogLine->PutString( aCollect ); \ + pLogArray->Insert( pLogLine, pLogArray->Count() ); \ + } \ + delete pLogMsg; \ +} \ + + +#define ADD_RUN_LOG() \ + ADD_TO_LOG(LOG_RUN, String(), String(), 0, 0, 0, String(), NULL) \ + +#define ADD_ERROR_LOG(aMsg, aFilename, nLine, nCol1, nCol2, aRevision) \ +{ \ ADD_TO_LOG(LOG_ERROR, aMsg, aFilename, nLine, nCol1, nCol2, aRevision, &pImpl->xErrorList) \ - pImpl->nErrorCount++; \ + pImpl->nErrorCount++; \ } -#define ADD_CALL_STACK_LOG(aMsg, aFilename, nLine, nCol1, nCol2) \ - ADD_TO_LOG(LOG_CALL_STACK, aMsg, aFilename, nLine, nCol1, nCol2, String(), NULL) \ - - -#define ADD_AUTO_LOG(aLogType, aMsg, pLogList) \ -{ \ - if ( BasicRuntimeAccess::HasRuntime() ) \ - { \ - BasicRuntime aRun = BasicRuntimeAccess::GetRuntime(); \ - ADD_TO_LOG(aLogType, aMsg, aRun.GetModuleName(SbxNAME_SHORT_TYPES), \ - aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2(), aRun.GetSourceRevision(), pLogList) \ - } \ - else \ - { \ - ADD_TO_LOG(aLogType, aMsg, UniString(), 0, 0, STRING_LEN, String(), pLogList) \ - } \ -} \ - -#define ADD_CASE_LOG(aMsg) \ - ADD_AUTO_LOG(LOG_TEST_CASE, aMsg, NULL) \ - -#define ADD_MESSAGE_LOG(aMsg) \ - ADD_AUTO_LOG(LOG_MESSAGE, aMsg, NULL) \ - -#define ADD_WARNING_LOG(aMsg) \ -{ \ - ADD_AUTO_LOG(LOG_WARNING, aMsg, &pImpl->xWarningList) \ - pImpl->nWarningCount++; \ +#define ADD_CALL_STACK_LOG(aMsg, aFilename, nLine, nCol1, nCol2) \ + ADD_TO_LOG(LOG_CALL_STACK, aMsg, aFilename, nLine, nCol1, nCol2, String(), NULL) \ + + +#define ADD_AUTO_LOG(aLogType, aMsg, pLogList) \ +{ \ + if ( BasicRuntimeAccess::HasRuntime() ) \ + { \ + BasicRuntime aRun = BasicRuntimeAccess::GetRuntime(); \ + ADD_TO_LOG(aLogType, aMsg, aRun.GetModuleName(SbxNAME_SHORT_TYPES), \ + aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2(), aRun.GetSourceRevision(), pLogList) \ + } \ + else \ + { \ + ADD_TO_LOG(aLogType, aMsg, UniString(), 0, 0, STRING_LEN, String(), pLogList) \ + } \ +} \ + +#define ADD_CASE_LOG(aMsg) \ + ADD_AUTO_LOG(LOG_TEST_CASE, aMsg, NULL) \ + +#define ADD_MESSAGE_LOG(aMsg) \ + ADD_AUTO_LOG(LOG_MESSAGE, aMsg, NULL) \ + +#define ADD_WARNING_LOG(aMsg) \ +{ \ + ADD_AUTO_LOG(LOG_WARNING, aMsg, &pImpl->xWarningList) \ + pImpl->nWarningCount++; \ } -#define ADD_WARNING_LOG2(aMsg, aFilename, nLine ) \ -{ \ +#define ADD_WARNING_LOG2(aMsg, aFilename, nLine ) \ +{ \ ADD_TO_LOG(LOG_WARNING, aMsg, aFilename, nLine, 0, STRING_LEN, String(), &pImpl->xWarningList) \ - pImpl->nWarningCount++; \ + pImpl->nWarningCount++; \ } -#define ADD_ASSERTION_LOG(aMsg) \ - ADD_AUTO_LOG(LOG_ASSERTION, aMsg, NULL) \ +#define ADD_ASSERTION_LOG(aMsg) \ + ADD_AUTO_LOG(LOG_ASSERTION, aMsg, NULL) \ -#define ADD_QA_ERROR_LOG(aMsg) \ +#define ADD_QA_ERROR_LOG(aMsg) \ if ( pImpl->bEnableQaErrors ) \ { \ - ADD_AUTO_LOG(LOG_QA_ERROR, aMsg, &pImpl->xQAErrorList) \ - pImpl->nQAErrorCount++; \ + ADD_AUTO_LOG(LOG_QA_ERROR, aMsg, &pImpl->xQAErrorList) \ + pImpl->nQAErrorCount++; \ } #endif diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx index 264a68aae257..0e7779086b2a 100644 --- a/automation/source/testtool/registry_win.cxx +++ b/automation/source/testtool/registry_win.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 @@ -31,7 +31,7 @@ //////////////////////////////////////////////////////////////////////////// //// -//// Windows ONLY +//// Windows ONLY //// //////////////////////////////////////////////////////////////////////////// @@ -70,7 +70,7 @@ String ReadRegistry( String aKey, String aValueName ) &hRegKey ) == ERROR_SUCCESS ) { LONG lRet; - sal_Unicode PathW[_MAX_PATH]; + sal_Unicode PathW[_MAX_PATH]; DWORD lSize = sizeof(PathW) / sizeof( sal_Unicode ); DWORD Type = REG_SZ; diff --git a/automation/source/testtool/registry_win.hxx b/automation/source/testtool/registry_win.hxx index 4a9492d80d2b..9174e0682aa9 100644 --- a/automation/source/testtool/registry_win.hxx +++ b/automation/source/testtool/registry_win.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/source/testtool/sysdir_win.cxx b/automation/source/testtool/sysdir_win.cxx index 44cb8bef2fe1..560a367ee82c 100644 --- a/automation/source/testtool/sysdir_win.cxx +++ b/automation/source/testtool/sysdir_win.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 @@ -31,7 +31,7 @@ //////////////////////////////////////////////////////////////////////////// //// -//// Windows ONLY +//// Windows ONLY //// //////////////////////////////////////////////////////////////////////////// @@ -61,7 +61,7 @@ void _SHFree( void *pv ) { - IMalloc *pMalloc; + IMalloc *pMalloc; if( NOERROR == SHGetMalloc(&pMalloc) ) { pMalloc->Free( pv ); @@ -75,9 +75,9 @@ void _SHFree( void *pv ) UniString _SHGetSpecialFolder( int nFolderID ) { - LPITEMIDLIST pidl; - HRESULT hHdl = SHGetSpecialFolderLocation( NULL, nFolderID, &pidl ); - UniString aFolder; + LPITEMIDLIST pidl; + HRESULT hHdl = SHGetSpecialFolderLocation( NULL, nFolderID, &pidl ); + UniString aFolder; if( hHdl == NOERROR ) { diff --git a/automation/source/testtool/sysdir_win.hxx b/automation/source/testtool/sysdir_win.hxx index c27e3e434e75..ceab5d359eff 100644 --- a/automation/source/testtool/sysdir_win.hxx +++ b/automation/source/testtool/sysdir_win.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/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx index bc0e94f76728..478a4a0b2081 100644 --- a/automation/source/testtool/tcommuni.cxx +++ b/automation/source/testtool/tcommuni.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 @@ -84,7 +84,7 @@ BOOL CommunicationManagerClientViaSocketTT::RetryConnect() if ( bSucc ) { - aFirstRetryCall = Time() + Time( 0, 1 ); // Max eine Minute Zeit + aFirstRetryCall = Time() + Time( 0, 1 ); // Max eine Minute Zeit for ( int i = 10 ; i-- ; ) GetpApp()->Reschedule(); } @@ -159,7 +159,7 @@ ULONG GetTTPortConfig() #endif ) { - aPortToTalk = Application::GetCommandLineParam( i ).Copy(6); + aPortToTalk = Application::GetCommandLineParam( i ).Copy(6); return (ULONG)aPortToTalk.ToInt64(); } } diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx index e92a93eb36a5..8c1d1115cfc7 100644 --- a/automation/source/testtool/tcommuni.hxx +++ b/automation/source/testtool/tcommuni.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 |