Remove some dead code.

12 files changed, 1 insertions, 582 deletions

diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index ba730491f672..aebbfb40d9a8 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -176,10 +176,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
 #endif
                 bSendData = TRUE;
             }
-            if ( m_bLog )
-            {
-//  HACK Too many KeyEvents generated              LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
-            }
             // cleanup
             aKeyString.Erase();
             pKeyWin = NULL;
@@ -274,7 +270,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
             case WINDOW_LISTBOX:
                 switch( nEventID )
                 {
-//                    case VCLEVENT_LISTBOX_DOUBLECLICK:
                     case VCLEVENT_LISTBOX_SELECT:
                         if ( m_bRecord )
                         {
@@ -431,26 +426,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                         }
                 }
                 break;
-/*          case C_MoreButton:
-                switch( nEventID )
-                {
-                    case M_IsOpen :
-                        pRet->GenReturn ( RET_Value, nUId, ((MoreButton*)pControl)->GetState());
-                        break;
-                    case M_Click :
-                        ((MoreButton*)pControl)->Click();
-                        break;
-                    case M_Open :
-                        ((MoreButton*)pControl)->SetState(TRUE);
-                        break;
-                    case M_Close :
-                        ((MoreButton*)pControl)->SetState(FALSE);
-                        break;
-                    default:
-                        ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "MoreButton" ) );
-                        break;
-                }
-                break;*/
             case WINDOW_SPINFIELD:
             case WINDOW_PATTERNFIELD:
             case WINDOW_NUMERICFIELD:
@@ -511,22 +486,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                             LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") );
                         }
                         break;
-/*      Keyevent or Timeout
-                    case M_Open :
-                        {
-                            MouseEvent aMEvnt;
-                            Point aPt( pControl->GetSizePixel().Width() / 2, pControl->GetSizePixel().Height() / 2 );
-                            aMEvnt = MouseEvent( aPt,1,MOUSE_SIMPLECLICK,MOUSE_LEFT );
-                            ImplMouseButtonDown( pControl, aMEvnt );
-
-                            ULONG nStart = Time::GetSystemTicks();
-                            ULONG nDelay = pControl->GetSettings().GetMouseSettings().GetActionDelay();
-                            while ( ( Time::GetSystemTicks() - nStart ) < nDelay + 100 )
-                                SafeReschedule();
-
-                            ImplMouseButtonUp  ( pControl, aMEvnt );
-                        }
-                        break;*/
                     }
                 break;
             case WINDOW_TOOLBOX:
@@ -549,118 +508,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                         StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
                                     bSendData = TRUE;
                                 }
-/* not needed                               if ( m_bLog )
-                                {
-                                }*/
                             }
                             break;
                         case VCLEVENT_TOOLBOX_CLICK:  /// ATTENTION this is called during initialisation of toolbox. whoever 'invented' this
                             pActionParent = pTB;
                             break;
-//                        case VCLEVENT_WINDOW_SHOW:        // not usable ATM. see above
-//                            if ( pActionParent )
-//                            {   // a new toolbox opens up, might be a tearoff
-//                                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_bLog )
-//                                    {
-//                                        LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") );
-//                                    }
-//                                }
-//                                pActionParent = NULL;
-//                            }
-//                            break;
                         case VCLEVENT_TOOLBOX_DEACTIVATE:
                             pActionParent = NULL;
                             break;
                     }
                 }
                 break;
-/*                  ToolBox *pTB = ((ToolBox*)pControl);
-                    if ( pTB->GetUniqueOrHelpId() != nUId ) // Also Button auf der ToolBox gefunden
-                    {
-                        if ( nParams == PARAM_NONE )
-                        {           // Wir f�lschen einen Parameter
-                            nParams = PARAM_USHORT_1;
-                            nNr1 = nUId;
-                        }
-                        else
-                            ReportError( nUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
-                    }
-
-#define FIND_HELP\
-{\
-    if( nParams == PARAM_USHORT_1 )\
-        nLNr1 = nNr1;\
-    for ( nNr1 = 0; nNr1 < pTB->GetItemCount() && nLNr1 != pTB->GetHelpId(pTB->GetItemId(nNr1)) ; nNr1++ ) {}\
-    bBool1 = nLNr1 == pTB->GetHelpId(pTB->GetItemId(nNr1));\
-    if ( !bBool1 )\
-        ReportError( nUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\
-    else\
-    {\
-        if ( !pTB->IsItemEnabled( pTB->GetItemId(nNr1) ) && nMethodId != _M_IsEnabled )\
-        {\
-            ReportError( nUId, GEN_RES_STR1( S_BUTTON_DISABLED_ON_TOOLBOX, MethodString( nMethodId ) ) );\
-            bBool1 = FALSE;\
-        }\
-        else if ( !pTB->IsItemVisible( pTB->GetItemId(nNr1) ) )\
-        {\
-            ReportError( nUId, GEN_RES_STR1( S_BUTTON_HIDDEN_ON_TOOLBOX, MethodString( nMethodId ) ) );\
-            bBool1 = FALSE;\
-        }\
-        else\
-        {\
-            if ( pTB->GetItemRect(pTB->GetItemId(nNr1)).IsEmpty() )\
-            {\
-                USHORT nLine = pTB->GetCurLine();\
-                do\
-                {\
-                    pTB->ShowLine( FALSE );\
-                    for ( int i = 1 ; i < 30 ; i++ )\
-                        SafeReschedule();\
-                }\
-                while ( pTB->GetCurLine() != nLine && pTB->GetItemRect(pTB->GetItemId(nNr1)).IsEmpty() );\
-                pTB->Invalidate( pTB->GetScrollRect() );\
-            }\
-            if ( pTB->GetItemRect(pTB->GetItemId(nNr1)).IsEmpty() )\
-            {\
-                ReportError( nUId, GEN_RES_STR1( S_CANNOT_MAKE_BUTTON_VISIBLE_IN_TOOLBOX, MethodString( nMethodId ) ) );\
-                bBool1 = FALSE;\
-            }\
-        }\
-    }\
-}\
-
-                    switch( nEventID )
-                    {
-                        case M_SetNextToolBox :
-                            if ( (nParams & PARAM_STR_1) )
-                                pTB->SetNextToolBox( aString1 );
-                            else
-                                pTB->SetNextToolBox( pTB->GetNextToolBox() );
-                            pTB->NextToolBox();
-                            break;
-                        case M_GetNextToolBox :
-                            pRet->GenReturn ( RET_Value, nUId, (String)pTB->GetNextToolBox());
-                            break;
-                        default:
-                            ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "ToolBox" ) );
-                            break;
-                    }
-                }
-                break;
-*/
             case WINDOW_CONTROL:
             case WINDOW_WINDOW:
                 switch( nEventID )
@@ -678,11 +536,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                 if ( pIdWin != pWin )
                                    bKeyFollowFocus = TRUE;
                                 aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId();
-                                if ( m_bLog )
-                                {
-//   HACK Too many KeyEvents generated                                 if ( aKeyString.Len() == 0 )
-//   HACK Too many KeyEvents generated                                     LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
-                                }
                                 if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) &&
                                       (( aKeyCode.GetGroup() == KEYGROUP_NUM)   ||
                                        ( aKeyCode.GetGroup() == KEYGROUP_ALPHA) ||
@@ -722,302 +575,22 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
 
                 }
                 break;
-              case WINDOW_DOCKINGWINDOW:
-//                switch( nEventID )
+            case WINDOW_DOCKINGWINDOW:
                 {
 //                  case 1 .. 0xffff:
     DBG_TRACE3( "TT_VCLMessage %u %u  %X",nEventID, pWin->GetType(), pWin );
 //                      BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode();
 //                      break;
-/*                  case M_Dock :
-                        if ( ((DockingWindow*)pControl)->IsFloatingMode() )
-                            ((DockingWindow*)pControl)->SetFloatingMode(FALSE);
-                        else
-                            ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) );
-                        break;
-                    case M_Undock :
-                        if ( !((DockingWindow*)pControl)->IsFloatingMode() )
-                            ((DockingWindow*)pControl)->SetFloatingMode(TRUE);
-                        else
-                            ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) );
-                        break;
-                    case M_IsDocked :
-                        pRet->GenReturn ( RET_Value, nUId, (comm_BOOL) !((DockingWindow*)pControl)->IsFloatingMode());
-                        break;
-                    case M_Close:
-                            //nWindowWaitUId = nUId;
-                        DBG_ASSERT( nUId == pControl->GetUniqueOrHelpId(), "nUID != UniqueOrHelpId");
-                        SET_WINP_CLOSING(pControl);
-                        ((DockingWindow*)pControl)->Close();
-                        break;
-                    case M_Size:
-                    case M_Move:
-                    case M_IsMax :
-                    case M_Minimize :
-                    case M_Maximize :
-                        if ( ((DockingWindow*)pControl)->IsFloatingMode() )
-                        {
-                            pControl = ((DockingWindow*)pControl)->GetFloatingWindow();
-                            goto FloatWin;
-                        }
-                        else
-                            ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_DOCKING_MODE, MethodString( nMethodId ) ) );
-                        break;
-                    case M_Help:        // Alles was unten weiterbehandelt werden soll
-                        goto MoreDialog;
-
-                    default:
-                        ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "DockingWindow" ) );
-                        break;*/
                 }
                 break;
-
-
-
-
-
-
             case WINDOW_FLOATINGWINDOW:
                 {
     DBG_TRACE3( "TT_VCLMessage %u %u  %X",nEventID, pWin->GetType(), pWin );
 //                    FloatingWindow *pFW = ((FloatingWindow*)pWin);
-/*                  switch( nEventID )
-                    {
-
-// M_OpenMenu an einem ToolboxButton
-                        case VCLEVENT_WINDOW_SHOW:
-                            if ( pActionParent )
-                            {   // a new FloatingWindow opens up, so we assume an OpenMenu
-                                // compare to 1 for floating ToolBoxes
-                                if ( ( pActionParent->GetUniqueOrHelpId() == 0 || pActionParent->GetUniqueOrHelpId() == 1 ) )
-                                    // generate direct Button access
-                                    StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetHelpId( pActionParent->GetCurItemId() ), (comm_USHORT)(M_OpenMenu) );
-                                else
-                                    // access via Toolbox
-                                    StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetUniqueOrHelpId(), (comm_USHORT)(M_OpenMenu|M_RET_NUM_CONTROL), pActionParent->GetHelpId( pActionParent->GetCurItemId() ) );
-                                bSendData = TRUE;
-                            }
-                            break;
-
-                    }
-  */              }
-                break;
-/*
-                    case M_AnimateMouse :
-                        AnimateMouse( pControl, MitteOben);
-                        break;
-                    case M_IsMax :
-                        pRet->GenReturn ( RET_Value, nUId, (comm_BOOL)!((FloatingWindow*)pControl)->IsRollUp());
-                        break;
-                    case M_Minimize :
-                        ((FloatingWindow*)pControl)->RollUp();
-                        break;
-                    case M_Maximize :
-                        ((FloatingWindow*)pControl)->RollDown();
-                        break;
-                    case M_Size:
-                    {
-                        if ( pControl->GetStyle() & WB_SIZEABLE )
-                        {
-                            pControl->SetSizePixel(Size(nNr1,nNr2));
-                            pControl->Resize();
-                        }
-                        else
-                            ReportError( nUId, GEN_RES_STR1( S_SIZE_NOT_CHANGEABLE, MethodString( nMethodId ) ) );
-                        break;
-                    }
-                    case M_Close:
-                        DBG_ASSERT( nUId == pControl->GetUniqueOrHelpId(), "nUID != UniqueOrHelpId");
-                        SET_WINP_CLOSING(pControl);
-                        ((FloatingWindow*)pControl)->Close();
-                        break;
-                    case M_Help:        // Alles was unten weiterbehandelt werden soll
-                    case M_Move:
-                        goto MoreDialog;
-                    default:
-                        ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "FloatingWin" ) );
-                        break;
-                }
-                break;*/
-
-
-
-
-
-
-
-
-/*
-            case C_ModelessDlg:
-            case C_Dlg:
-            case C_TabDlg:
-                MoreDialog:
-                switch( nEventID )
-                {
-
-                    // (Rect GetRect)
-
-                    case M_AnimateMouse :
-                        AnimateMouse( pControl, MitteOben);
-                        break;
-                    case M_Close:
-                        DBG_ASSERT( nUId == pControl->GetUniqueOrHelpId(), "nUID != UniqueOrHelpId");
-                        SET_WINP_CLOSING(pControl);
-                        ((SystemWindow*)pControl)->Close();
-                        break;
-                    case M_Move:
-                    {
-                        pControl->SetPosPixel(Point(nNr1,nNr2));
-                        break;
-                    }
-                    default:
-                        ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "Dialog" ) );
-                        break;
-                }
-                break;*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*
-            case C_WorkWin:
-                switch( nEventID )
-                {
-                    case M_Close:
-                        DBG_ASSERT( nUId == pControl->GetUniqueOrHelpId(), "nUID != UniqueOrHelpId");
-                        SET_WINP_CLOSING(pControl);
-                        ((WorkWindow*)pControl)->Close();
-                        break;
-                    case M_Size:
-                    case M_Move:
-                        goto FloatWin;
-                        break;
-                    case M_Help:        // Alles was unten weiterbehandelt werden soll
-                        goto MoreDialog;
-                    default:
-                        ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "WorkWindow" ) );
-                        break;
                 }
                 break;
-  */
-
-
-/*          case C_TabPage:
-                switch( nEventID )
-                {
-                }
-                break;*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*
-            case C_MessBox:
-            case C_InfoBox:
-            case C_WarningBox:
-            case C_ErrorBox:
-            case C_QueryBox:
-                {
-                    BOOL bDone = TRUE;
-                    MessBox* pMB = (MessBox*)pControl;
-                    switch( nEventID )
-                    {
-                        case M_GetCheckBoxText:
-                            pRet->GenReturn ( RET_Value, nUId, pMB->GetCheckBoxText() );
-                            break;
-                        case M_IsChecked :
-                            pRet->GenReturn ( RET_Value, nUId, comm_BOOL( pMB->GetCheckBoxState() == STATE_CHECK) );
-                            break;
-                        case M_GetState :
-                            pRet->GenReturn ( RET_Value, nUId, comm_ULONG( pMB->GetCheckBoxState() ));
-                            break;
-                        case M_Check :
-                            pMB->SetCheckBoxState( STATE_CHECK );
-                            break;
-                        case M_UnCheck :
-                            pMB->SetCheckBoxState( STATE_NOCHECK );
-                            break;
-                        case M_GetText :
-                            pRet->GenReturn ( RET_Value, nUId, pMB->GetMessText());
-                            break;
-
-                        default:
-                            bDone = FALSE;
-                            break;
-                    }
-                    if ( bDone )
-                        break;  // break the case here else continue at C_ButtonDialog
-                }
-            case C_ButtonDialog:
-                {
-                    ButtonDialog* pBD = (ButtonDialog*)pControl;
-#if OSL_DEBUG_LEVEL > 1
-                    m_pDbgWin->AddText( "Working MessBox: " );
-                    if (pControl->IsVisible())
-                        m_pDbgWin->AddText("*(Visible)\n");
-                    else
-                        m_pDbgWin->AddText("*(nicht Visible)\n");
-#endif
-                    switch( nEventID )
-                    {
-                        case M_GetText :
-                            pRet->GenReturn ( RET_Value, nUId, pControl->GetText());
-                            break;
-                        case M_Click:
-                            if ( nParams & PARAM_USHORT_1 )
-                            {
-                                if ( pBD->GetPushButton( nNr1 ) )
-                                {
-                                    if ( nNr1 != BUTTONID_HELP )
-                                    {
-                                        SET_WINP_CLOSING(pControl);
-                                    }
-                                    pBD->GetPushButton( nNr1 )->Click();
-                                }
-                                else
-                                    ReportError( nUId, GEN_RES_STR2( S_NO_DEFAULT_BUTTON, UniString::CreateFromInt32( nNr1 ), MethodString( nMethodId ) ) );
-                            }
-                            else
-                                ReportError( nUId, GEN_RES_STR1( S_BUTTONID_REQUIRED, MethodString( nMethodId ) ) );
-                            break;
-                        case M_GetButtonCount :
-                            pRet->GenReturn ( RET_Value, nUId, comm_ULONG(pBD->GetButtonCount()));
-                            break;
-                        case M_GetButtonId :
-                            if ( ValueOK(nUId, MethodString( nMethodId ),nNr1,pBD->GetButtonCount()) )
-                                pRet->GenReturn ( RET_Value, nUId, comm_ULONG(pBD->GetButtonId(nNr1-1)));
-                            break;
-                        default:
-                            ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "MessageBox" ) );
-                            break;
-                    }
-                    break;
-
-
-                 */
-
-
         }
 
-
         switch( nEventID )
         {
             case VCLEVENT_CONTROL_LOSEFOCUS:
@@ -1039,13 +612,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
         }
 
         pLastWin = pWin;
-
     }  // if
-    else if ( pEvent->ISA( VclMenuEvent ) )
-    {
-//        VclMenuEvent* pMenuEvent = ( VclMenuEvent* ) pEvent;
-    }
-
 
     if ( bSendData )
         new StatementFlow( NULL, F_EndCommandBlock );   // Kommando zum Senden erzeugen und in que eintragen
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index ddf6a0ae4e42..d98869bc97af 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -133,34 +133,6 @@ DBG_CTOR(ControlItem,0);
     pData->aUId = aUIdP;
 }
 
-/*ControlItem::ControlItem( const String &Name, const String &URL, const URLType aType )
-{
-DBG_CTOR(ControlItem,0);
-    InitData();
-    pData->Kurzname = Name;
-    pData->aURL = URL;
-    pData->nUId = aType;
-}
-
-ControlItem::ControlItem( const String &Name, const String &URL, const ULONG nUId )
-{
-DBG_CTOR(ControlItem,0);
-    InitData();
-    pData->Kurzname = Name;
-    pData->aURL = URL;
-    pData->nUId = nUId;
-}
-
-ControlItem::ControlItem( const char *Name, const String &URL, const ULONG nUId )
-{
-DBG_CTOR(ControlItem,0);
-    InitData();
-    pData->Kurzname.AssignAscii( Name );
-    pData->aURL = URL;
-    pData->nUId = nUId;
-} */
-
-
 ControlItem::ControlItem( ControlData *pDataP )
 {
 DBG_CTOR(ControlItem,0);
@@ -180,20 +152,6 @@ ControlItemSon::ControlItemSon(const String &Name, SmartId aUIdP )
 : ControlItem( Name, aUIdP )
 {}
 
-/*ControlItemSon::ControlItemSon(const String &Name, const String &URL, const URLType aType )
-: ControlItem( Name, URL, aType )
-{}
-
-ControlItemSon::ControlItemSon(const String &Name, const String &URL, const ULONG nUId )
-: ControlItem( Name, URL, nUId )
-{}
-
-ControlItemSon::ControlItemSon(const char *Name, const String &URL, const ULONG nUId )
-: ControlItem( Name, URL, nUId )
-{}*/
-
-
-
 BOOL ControlDef::operator < (const ControlItem &rPar)
 {
     return pData->Kurzname.CompareIgnoreCaseToAscii(rPar.pData->Kurzname) == COMPARE_LESS;
@@ -226,12 +184,6 @@ ControlDef::ControlDef(const String &Name, SmartId aUIdP )
     DBG_CTOR(ControlDef,0);
 }
 
-/*ControlDef::ControlDef(const String &Name, const String &URL, const URLType aType )
-: ControlItemSon( Name, URL, aType )
-{
-    DBG_CTOR(ControlDef,0);
-} */
-
 ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons )
 : ControlItemSon("", pOriginal->pData->aUId)
 {
@@ -2914,15 +2866,6 @@ xub_StrLen TestToolObj::PreCompilePart( String &aSource, xub_StrLen nStart, xub_
     aSource.SearchAndReplaceAscii( "try", aReplacement, nTry );
     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:
     aReplacement.Erase();
     aReplacement.AppendAscii( "on error goto " );
     aReplacement += aFinalErrorLabel;
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 9d22f36a47f0..75b698cb521d 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -73,9 +73,6 @@ private:
 public:
 
     inline          ProgressInfo( SfxObjectShell* pObjSh, const String& rText, ULONG nRange );
-
-//  inline void     StartProgress( const String& rName, ULONG nStates );
-//  inline void     EndProgress();
     inline void     StepProgress();
 };
 
@@ -85,19 +82,6 @@ inline ProgressInfo::ProgressInfo( SfxObjectShell* pObjSh, const String& rText,
     nCurState = 0;
 }
 
-// inline void ProgressInfo::StartProgress( const String& rName, ULONG nStates )
-// {
-//  nCurState = 0;
-//  if ( pStbMgr )
-//      pStbMgr->StartProgressMode( rName, nStates );
-// }
-
-// inline void ProgressInfo::EndProgress()
-// {
-//  if ( pStbMgr )
-//      pStbMgr->EndProgressMode();
-//}
-
 inline void ProgressInfo::StepProgress()
 {
     SetState( ++nCurState );
@@ -233,16 +217,6 @@ protected:
     BOOL            ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult );
     SbxBase*        ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement );
 
-//  virtual DragDropMode    NotifyBeginDrag( SvLBoxEntry* );
-//  virtual BOOL    NotifyQueryDrop( SvLBoxEntry* );
-
-//  virtual BOOL    NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-//                      SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
-//  virtual BOOL    NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-//                      SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos );
-//  BOOL            NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-//                      SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos, BOOL bMove );
-
 public:
     WatchTreeListBox( Window* pParent, WinBits nWinBits );
     ~WatchTreeListBox();
@@ -377,7 +351,6 @@ public:
     virtual void    StoreData();
     virtual void    UpdateData();
     virtual BOOL    CanClose();
-    // virtual void PrintData( Printer* pPrinter );
     // return number of pages to be printed
     virtual sal_Int32 countPages( Printer* pPrinter );
     // print page
@@ -413,8 +386,6 @@ public:
 
     void            EditMacro( const String& rMacroName );
 
-//  void            InsertFromObjectCatalog( ObjectCatalog* pObjDlg );
-
     BOOL            ToggleBreakPoint( ULONG nLine );
 
     BasicStatus&    GetBasicStatus() { return aStatus; }
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index e4bcbe29a294..e11b4b288814 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -70,7 +70,6 @@ sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex );
 
 struct BasicStatus
 {
-//  BOOL    bCompiled       : 1;
     BOOL    bIsRunning      : 1;
     BOOL    bError          : 1;
     BOOL    bIsInReschedule : 1;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 865efbdef5e1..fe49487d39d0 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -70,7 +70,6 @@ public:
 };
 
 // -----------------------------------------------------------------------
-
 #include <sfx2/layout.hxx>
 #include <layout/layout-pre.hxx>
 
diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl
index 0e3a953bcad1..cb1c5e13aa06 100644
--- a/extensions/source/dbpilots/unoautopilot.inl
+++ b/extensions/source/dbpilots/unoautopilot.inl
@@ -28,14 +28,9 @@
 // no include protecttion
 // this file is included from unoautopilot.hxx directly
 
-//using namespace ::com::sun::star::uno;
-//using namespace ::com::sun::star::lang;
-//using namespace ::com::sun::star::beans;
-//
 //=====================================================================
 //= OUnoAutoPilot
 //=====================================================================
-//---------------------------------------------------------------------
 template <class TYPE, class SERVICEINFO>
 OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB)
     :OUnoAutoPilot_Base(_rxORB)
diff --git a/extensions/source/preload/unoautopilot.inl b/extensions/source/preload/unoautopilot.inl
index 27acdd6864f3..317dbd298620 100644
--- a/extensions/source/preload/unoautopilot.inl
+++ b/extensions/source/preload/unoautopilot.inl
@@ -28,14 +28,9 @@
 // no include protecttion
 // this file is included from unoautopilot.hxx directly
 
-//using namespace ::com::sun::star::uno;
-//using namespace ::com::sun::star::lang;
-//using namespace ::com::sun::star::beans;
-//
 //=====================================================================
 //= OUnoAutoPilot
 //=====================================================================
-//---------------------------------------------------------------------
 template <class TYPE, class SERVICEINFO>
 OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB)
     :OUnoAutoPilot_Base(_rxORB)
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index 0fc3691a47dc..e08231409bed 100644
--- a/extensions/test/sax/testsax.cxx
+++ b/extensions/test/sax/testsax.cxx
@@ -109,13 +109,9 @@ using namespace usr;
 
 /****
 * test szenarios :
-*
-*
-*
 ****/
 
 
-
 class OSaxParserTest :
         public XSimpleTest,
         public OWeakObject
@@ -165,8 +161,6 @@ private:
 
 /**
 * for external binding
-*
-*
 **/
 XInterfaceRef OSaxParserTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
 {
diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx
index 820f962de8b0..19efbc72a947 100644
--- a/extensions/test/sax/testwriter.cxx
+++ b/extensions/test/sax/testwriter.cxx
@@ -108,9 +108,6 @@ using namespace usr;
 
 /****
 * test szenarios :
-*
-*
-*
 ****/
 
 
@@ -398,20 +395,8 @@ void AttributeListImpl::clear()
     OSL_ASSERT( ! getLength() );
 }
 
-
-
-
-
-
-
-
-
-
-
 /**
 * for external binding
-*
-*
 **/
 XInterfaceRef OSaxWriterTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
 {
@@ -751,8 +736,6 @@ void OSaxWriterTest::testPerformance(const  XExtendedDocumentHandlerRef &r )
             r->ignorableWhitespace( L"");
             r->startElement( L"huhu" , rList );
             r->characters( testParagraph );
-//          writeParagraph( r , testParagraph );
-
             r->ignorableWhitespace( L"");
             r->endElement( L"huhu" );
         }
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 3043d119c122..1ca417e33d4c 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -368,19 +368,8 @@ void OMarkableOutputStreamTest::testSimple(     const XOutputStreamRef &rOutput
 
 }
 
-/***
-* the test methods
-*
-****/
-
-
-
-
-
 /**
 * for external binding
-*
-*
 **/
 XInterfaceRef OMarkableOutputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
 {
@@ -418,7 +407,6 @@ UString     OMarkableOutputStreamTest_getImplementationName() THROWS( () )
 //-----------------------------------------------------
 // Input stream
 
-
 class OMarkableInputStreamTest :
         public XSimpleTest,
         public OWeakObject
@@ -641,19 +629,8 @@ void OMarkableInputStreamTest::testSimple(      const XOutputStreamRef &rOutput
     rInput->closeInput();
 }
 
-/***
-* the test methods
-*
-****/
-
-
-
-
-
 /**
 * for external binding
-*
-*
 **/
 XInterfaceRef OMarkableInputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
 {
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index d9278a4a0860..329e65b76cc8 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -33,9 +33,7 @@
 #include "property.hrc"
 #include "convert.hxx"
 
-/** === begin UNO includes === **/
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
-/** === end UNO includes === **/
 #include <tools/debug.hxx>
 #include <tools/datetime.hxx>
 #include <rtl/math.hxx>
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 330b4c800f28..e00239f85112 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -295,8 +295,6 @@ class OStorage  : public ::com::sun::star::lang::XTypeProvider
                 , public ::com::sun::star::embed::XTransactedObject
                 , public ::com::sun::star::embed::XTransactionBroadcaster
                 , public ::com::sun::star::util::XModifiable
-                // , public ::com::sun::star::container::XNameAccess
-                // , public ::com::sun::star::lang::XComponent
                 , public ::com::sun::star::embed::XEncryptionProtectedSource
                 , public ::com::sun::star::beans::XPropertySet
                 , public ::com::sun::star::embed::XOptimizedStorage