diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-04 17:57:31 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-06 13:43:35 +0100 |
commit | 50c26300e5b5ae9671f18a9e449516604d16105f (patch) | |
tree | e4f0cf83c41bbd70bbe6021f85b8e97815134f42 /automation | |
parent | e78706a8bf35d8471982e36c4543f2db8a35f1c2 (diff) |
Remove lots of dead code
Diffstat (limited to 'automation')
-rw-r--r-- | automation/source/server/retstrm.hxx | 4 | ||||
-rw-r--r-- | automation/source/server/scmdstrm.hxx | 2 | ||||
-rw-r--r-- | automation/source/server/server.cxx | 59 | ||||
-rw-r--r-- | automation/source/server/sta_list.cxx | 31 | ||||
-rw-r--r-- | automation/source/server/statemnt.cxx | 39 | ||||
-rw-r--r-- | automation/source/server/statemnt.hxx | 12 | ||||
-rw-r--r-- | automation/source/testtool/comm_bas.cxx | 1 | ||||
-rw-r--r-- | automation/source/testtool/cretstrm.hxx | 2 | ||||
-rw-r--r-- | automation/source/testtool/objtest.hxx | 13 |
9 files changed, 0 insertions, 163 deletions
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index ed620a4f6751..fb66ef3bfa74 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -42,8 +42,6 @@ public: ~RetStream(); using CmdBaseStream::GenError; -// void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );} -// new void GenError( SmartId aUId, String aString ); using CmdBaseStream::GenReturn; @@ -55,7 +53,6 @@ public: void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );} void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );} -// new void GenReturn( USHORT nRet, SmartId aUId, String aString ); void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue ); void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool ); @@ -72,7 +69,6 @@ public: void Write( comm_USHORT nNr ){CmdBaseStream::Write( nNr );} void Write( comm_ULONG nNr ){CmdBaseStream::Write( nNr );} void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );} -// new void Write( SbxValue &aValue ); // Complex Datatypes to be handled system dependent diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx index d578909ad3ab..e2725b6f0070 100644 --- a/automation/source/server/scmdstrm.hxx +++ b/automation/source/server/scmdstrm.hxx @@ -49,9 +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_BOOL &bBool ){CmdBaseStream::Read ( bBool );} -// new void Read ( String &aString ); void Read ( SfxPoolItem *&pItem ); void Read ( ::com::sun::star::beans::PropertyValue &rItem ); diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index dd2e4cbd0129..62d5f13ba897 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -342,7 +342,6 @@ void ExtraIdle::Timeout() { #if OSL_DEBUG_LEVEL > 1 -//#define TT_NO_DECRYPT #define TT_CODE #else #define TT_CODE @@ -485,11 +484,7 @@ void ExtraIdle::Timeout() "1EIGpcw0WfiaOul1s19ZIECoLBx-#S"; -//#if OSL_DEBUG_LEVEL > 1 -// SvFileStream aStream( "d:\\gh_writeback.jpg" , STREAM_STD_READWRITE | STREAM_TRUNC ); -//#else SvMemoryStream aStream; -//#endif xub_StrLen c; xub_StrLen cRest = 0; @@ -529,43 +524,6 @@ void ExtraIdle::Timeout() ::svt::OStringTransfer::CopyString( CUniString("\nSorry! no bitmap"), StatementList::GetFirstDocFrame() ); } -/*********************************************************************** -// 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 ); - xub_StrLen c; - String aOut; - String aDreierGruppe; - xub_StrLen cRest=0; - aStream >> c; - while ( !aStream.IsEof() ) - { - cRest <<= 2; // Im ersten Durchgang egal, da immer 0 - cRest |= ( c & 0x03 ); - c >>= 2; - aDreierGruppe += aTr.GetChar( c ); - - if ( aDreierGruppe.Len() == 3 ) - { - aOut += aTr.GetChar( cRest ); - aOut += aDreierGruppe; - cRest = 0; - aDreierGruppe = ""; - } - aStream >> c; - } - if ( aDreierGruppe.Len() ) - { - aOut += cRest; - aOut += aDreierGruppe; - } - ::svt::OStringTransfer::CopyString( aOut ); -**********************************************************************************/ - new StatementSlot( StatementList::pTTProperties->nSidPaste ); return; } @@ -646,9 +604,6 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) #endif StatementList *pC = StatementList::pFirst; -// MessBox MB( pMainWin, WB_DEF_OK|WB_OK, "Pause ...", "... und Weiter" ); -// MB.Execute(); - if ( !StatementList::bCatchGPF ) { if (!pC->CheckWindowWait() || !pC->Execute()) @@ -697,24 +652,11 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) } } -/* #i46293# remove reschedules - for (int xx = 1;xx < 20;xx++) - StatementList::NormalReschedule(); -*/ m_bInsideExecutionLoop = FALSE; } StatementList::aWindowWaitUId = SmartId(); // Warten rcksetzen, da handler sowieso verlassen wird -/* if( StatementList::pFirst && !StatementList::bReadingCommands ) - // Abfrage ntig, da andere CommandHdl aktiv sein knnen oder - // neue Commands gelesen werden knnen - { - delete StatementList::pFirst; // Lscht die gesamte Liste !! - StatementList::pFirst = NULL; - StatementList::pCurrent = NULL; // Nur zur Sicherheit, sollte hier sowieso NULL sein - }*/ - #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Leaving CommandHdl\n" ); #endif @@ -731,7 +673,6 @@ IMPL_LINK( ImplRemoteControl, QueCommandsEvent, CommunicationLink*, pCL ) BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) { -// return TRUE; USHORT nId; if( !m_bIdleInserted ) diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index 756cfa980114..fbc046cddf42 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -129,12 +129,6 @@ TTSettings* GetTTSettings() #define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 )) -/* -UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } -UniString GEN_RES_STR1( ULONG nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } -UniString GEN_RES_STR2( ULONG nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } -UniString GEN_RES_STR3( ULONG nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );} -*/ StatementList::StatementList() : nRetryCount(MAX_RETRIES) , bStatementInQue(FALSE) @@ -301,8 +295,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB while ( pPParent->GET_REAL_PARENT() ) pPParent = pPParent->GET_REAL_PARENT(); -// if ( !IsFirstDocFrame( pPParent ) ) -// { // get overlap window. Will be dialog else document itself pBase = pBase->GetWindow( WINDOW_OVERLAP ); @@ -321,16 +313,11 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB if ( pControl ) return pControl; -// } } } pBase = Application::GetFirstTopLevelWindow(); - // Skip FirstDocFrame -// if ( bSearchFocusFirst && IsFirstDocFrame( pBase ) ) -// pBase = Application::GetNextTopLevelWindow( pBase ); - while ( pBase ) { pControl = SearchAllWin( pBase, aSearch ); @@ -338,9 +325,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB return pControl; pBase = Application::GetNextTopLevelWindow( pBase ); - // Skip FirstDocFrame -// if ( bSearchFocusFirst && IsFirstDocFrame( pBase ) ) -// pBase = Application::GetNextTopLevelWindow( pBase ); } return NULL; } @@ -351,9 +335,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB if ( pResult ) return pResult; -// if ( pBase->GetType() != WINDOW_BORDERWINDOW ) -// return NULL; - if ( !aSearch.HasSearchFlag( SEARCH_NOOVERLAP ) ) { if ( pBase->GetWindow( WINDOW_FIRSTOVERLAP ) ) @@ -553,8 +534,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) return pBaseMenu; USHORT i; -// while ( pBaseMenu ) -// { i = 0; while ( i < pBaseMenu->GetItemCount() ) { @@ -572,7 +551,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu ) else i++; } -// } } else { @@ -618,7 +596,6 @@ 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()); // only matches ResID due to problems with UNIX Window Managers return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ); } @@ -1147,10 +1124,6 @@ void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } else { - // DragManager* pDragManager = DragManager::GetDragManager(); - // if ( pDragManager ) - // pDragManager->MouseMove( aMEvnt, pWin ); - // else if ( pWin->IsTracking() ) { TrackingEvent aTEvt( aMEvnt ); @@ -1191,10 +1164,6 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect ) } else { - // DragManager* pDragManager = DragManager::GetDragManager(); - // if ( pDragManager ) - // pDragManager->ButtonUp( aMEvnt, pWin ); - // else if ( pWin->IsTracking() ) { // siehe #64693 die Position ist fr Toolboxen relevant diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 315e669ab81c..e2e868a1cd31 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -4155,10 +4155,6 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) if ( (pControl->GetType() == WINDOW_TOOLBOX) && pTB->IsMenuEnabled() ) { pTB->ExecuteCustomMenu(); -/* Rectangle aRect = pTB->GetMenubuttonRect(); - AnimateMouse( pControl, aRect.Center() ); - MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); - ImplMouseButtonDown( pTB, aMEvnt );*/ } else { @@ -4657,10 +4653,6 @@ BOOL StatementControl::Execute() for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ ) { pTControl->SelectTabPage( pTControl->GetPageId(i) ); - /*if (pTControl->GetCurPageId()) - pTControl->DeactivatePage(); - pTControl->SetCurPageId( pTControl->GetPageId(i) ); - pTControl->ActivatePage();*/ aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId(); i++; if ( i >= pTControl->GetPageCount() ) @@ -4671,10 +4663,6 @@ BOOL StatementControl::Execute() if ( !aID.Matches( aWantedID ) ) { pTControl->SelectTabPage( nActive ); - /*if (pTControl->GetCurPageId()) - pTControl->DeactivatePage(); - pTControl->SetCurPageId( nActive ); - pTControl->ActivatePage();*/ ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); } } @@ -5841,10 +5829,6 @@ BOOL StatementControl::Execute() else pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pELB->getSelIndex() +1)); break; -/* xxxcase M_SetNoSelection : - ((ListBox*)pControl)->SetNoSelection(); - ((ListBox*)pControl)->Select(); - break; */ default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "RoadMap" ) ); break; @@ -5875,22 +5859,11 @@ BOOL StatementControl::Execute() { ::svt::table::PTableModel pModel = pTC->GetModel(); Any aCell = pModel->getCellContent()[nNr2-1][nNr1-1]; - /* doesn't work ATM since it gets casted to SbxDATE in VCLTestTool unfortunately - SbxVariableRef xRes = new SbxVariable( SbxVARIANT ); - unoToSbxValue( xRes, aCell ); - pRet->GenReturn ( RET_Value, aUId, *xRes );*/ Type aType = aCell.getValueType(); TypeClass eTypeClass = aType.getTypeClass(); switch( eTypeClass ) { - /*case TypeClass_ENUM: - { - sal_Int32 nEnum = 0; - enum2int( nEnum, aValue ); - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)nEnum ); - } - break;*/ case TypeClass_BOOLEAN: pRet->GenReturn ( RET_Value, aUId, *(sal_Bool*)aCell.getValue() ); break; @@ -5986,18 +5959,6 @@ BOOL StatementControl::Execute() 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 : - if ( ! (nParams & PARAM_USHORT_1) ) - nNr1 = 1; - if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) ) - { - nNr1--; - COUNT_LBOX( FirstSelected, NextSelected, nNr1); - GetFirstValidTextItem( pThisEntry ); - pRet->GenReturn ( RET_Value, aUId, pItem->GetText() ); - } - break; - */ default: ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "TableControl" ) ); break; diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index a4d2b76f5632..63385b804ed4 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -31,12 +31,6 @@ ** Es gibt immer nur eine Statementliste, die verpointert ist. ** jederzeit kann das der Anfang der Kette abgefragt werden. ** -** -** -** -** -** -** ***************************************************************************/ #ifndef _STATEMNT_HXX #define _STATEMNT_HXX @@ -117,7 +111,6 @@ BOOL IsDialog(Window *pWin); // Ist *pWin von SystemWindow abgeleitet (Ka BOOL IsAccessable(Window *pWin); // Ist *pWin Zugreifbar (ber IsEnabled und Parents geprft) -//class SafePointer : CriticalSection class SafePointer { SafePointer *pSelf; @@ -125,8 +118,6 @@ 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; } -// virtual operator -> (); { DBG_ASSERT(pMyself == this,"-> von Nicht existierendem Objekt aufgerufen"); } }; @@ -216,7 +207,6 @@ public: if ( pLastFocusWindow != GetpApp()->GetFocusWindow() || ( Application::GetModalModeCount() > nModalCount ) -// || ( DragManager::GetDragManager() && !bWasDragManager ) || ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu ) || ( StarBASIC::IsRunning() && !bBasicWasRunning ) ) { @@ -256,8 +246,6 @@ protected: USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ); public: -// void AddStatement( StatementList *pNewStatement ); - virtual ~StatementList(); void Advance(); virtual BOOL Execute() = 0; diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx index 8c206b108926..10cb95570804 100644 --- a/automation/source/testtool/comm_bas.cxx +++ b/automation/source/testtool/comm_bas.cxx @@ -145,7 +145,6 @@ CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject( , m_bCatchOpen( FALSE ) , m_pNewLink( NULL ) { -// SetName( CUniString("Manager") ); m_pMethods = &aManagerMethods[0]; m_pManager = new CommunicationManagerClientViaSocket; m_pManager->SetConnectionOpenedHdl( LINK( this, CommunicationWrapper, Open ) ); diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx index 206d74db33ba..f7cbe3309865 100644 --- a/automation/source/testtool/cretstrm.hxx +++ b/automation/source/testtool/cretstrm.hxx @@ -45,10 +45,8 @@ 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 );} virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );} void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );} -// new void Read( String &aString ); void Read( SbxValue &aValue ); }; diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx index f70270a77a6d..a7297ad79a32 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.hxx @@ -121,9 +121,6 @@ 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 ULONG nUId ); -// ControlItem( const char *Name, const String &URL, const ULONG nUId ); ControlItem( ControlData *pDataP ); virtual ~ControlItem() { DBG_DTOR(ControlItem,0); @@ -131,7 +128,6 @@ DBG_DTOR(ControlItem,0); } virtual BOOL operator < (const ControlItem &rPar)=0; virtual BOOL operator == (const ControlItem &rPar)=0; -// void Write( SvStream &aStream ); }; SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10) @@ -149,7 +145,6 @@ protected: public: ControlSon() : pSons( NULL ) {}; ~ControlSon(); -// void Write( SvStream &aStream ); USHORT Son_Count() { return pSons->Count(); } void Sons( CNames *pNewSons ) { pSons = pNewSons; } @@ -162,10 +157,6 @@ 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 ULONG nUId ); -// ControlItemSon(const char *Name, const String &URL, const ULONG nUId ); -// void Write( SvStream &aStream ); }; class ControlDef : public ControlItemSon @@ -174,7 +165,6 @@ 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 &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE ); ~ControlDef() {DBG_DTOR(ControlDef,0);} virtual BOOL operator < (const ControlItem &rPar); @@ -245,9 +235,6 @@ typedef std::map< String, String > Environment; class ImplTestToolObj { public: -// ImplTestToolObj() -// ~ImplTestToolObj() - String ProgParam; // Parameter der zu Testenden APP; Gesetzt ber Start DirEntry aFileBase; // Grundpfad fr die *.sid und *.win Dateien (Aus Configdatei) |