Commented code fragments, meaningless and bogus comments removed.

4 files changed, 18 insertions, 178 deletions

diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index f9f27d6435c8..e93c6f8258a8 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -101,7 +101,6 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
     SdrView *pSdrView = m_pSh->GetDrawView();
 
     // #i33136#
-    // pSdrView->SetOrtho(rMEvt.IsShift());
     pSdrView->SetOrtho(doConstructOrthogonal() ? !rMEvt.IsShift() : rMEvt.IsShift());
     pSdrView->SetAngleSnapEnabled(rMEvt.IsShift());
 
@@ -212,8 +211,6 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
                     {
                         bNoInterrupt = TRUE;
                         pSdrView->MarkPoint(*pHdl);
-//                      bReturn = pSdrView->BegDragObj(m_aStartPos, (OutputDevice*) NULL, pHdl);
-//                      m_pWin->SetDrawAction(TRUE);
                     }
                 }
             }
@@ -240,11 +237,9 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
                     {
                         if (!pSdrView->HasMarkablePoints())
                         {
-                            //JP 10.10.2001: Bug 89619 - don't scroll the
-                            //              cursor into the visible area
                             BOOL bUnlockView = !m_pSh->IsViewLocked();
                             m_pSh->LockView( TRUE ); //lock visible section
-                            m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // Alles deselektieren
+                            m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // deselect all
                             if( bUnlockView )
                                 m_pSh->LockView( FALSE );
                         }
@@ -281,7 +276,6 @@ BOOL SwDrawBase::MouseMove(const MouseEvent& rMEvt)
     if (IsCreateObj() && !m_pWin->IsDrawSelMode() && pSdrView->IsCreateObj())
     {
         // #i33136#
-        // pSdrView->SetOrtho(rMEvt.IsShift());
         pSdrView->SetOrtho(doConstructOrthogonal() ? !rMEvt.IsShift() : rMEvt.IsShift());
         pSdrView->SetAngleSnapEnabled(rMEvt.IsShift());
 
@@ -531,9 +525,6 @@ void __EXPORT SwDrawBase::Deactivate()
     m_pWin->ReleaseMouse();
     bNoInterrupt = FALSE;
 
-//  if(!m_pSh->IsObjSelected())
-//      m_pSh->Edit();
-
     if(m_pWin->GetApplyTemplate())
         m_pWin->SetApplyTemplate(SwApplyTemplate());
     m_pSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW);
@@ -647,7 +638,6 @@ void SwDrawBase::BreakCreate()
     m_pWin->ReleaseMouse();
 
     Deactivate();
-//  m_pView->LeaveDrawCreate();
 }
 
 /*************************************************************************
@@ -700,9 +690,7 @@ void SwDrawBase::EnterSelectMode(const MouseEvent& rMEvt)
         m_pView->NoRotate();
     }
 }
-/* -----------------------------03.04.2002 10:52------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwDrawBase::CreateDefaultObject()
 {
     Point aStartPos = GetDefaultCenterPos();
@@ -714,9 +702,7 @@ void SwDrawBase::CreateDefaultObject()
     Rectangle aRect(aStartPos, aEndPos);
     m_pSh->CreateDefaultShape( static_cast< UINT16 >(m_pWin->GetSdrDrawMode()), aRect, m_nSlotId);
 }
-/* -----------------25.10.2002 14:14-----------------
- *
- * --------------------------------------------------*/
+
 Point  SwDrawBase::GetDefaultCenterPos()
 {
     Size aDocSz(m_pSh->GetDocSize());
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index fd3cec7e1114..fd4fc8befa04 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -214,8 +214,8 @@ void SwInputWindow::ShowWin()
         OSL_ENSURE(pMgr == 0, "FieldManager not deleted");
         pMgr = new SwFldMgr;
 
-        // JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier
-        //              also setzen
+        // Formel soll immer mit einem "=" beginnen, hier
+        // also setzen
         String sEdit( '=' );
         if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() )
         {
@@ -379,8 +379,8 @@ void  SwInputWindow::ApplyFormula()
     }
     pWrtShell->Pop( FALSE );
 
-    // JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier
-    //              also wieder entfernen
+    // Formel soll immer mit einem "=" beginnen, hier
+    // also wieder entfernen
     String sEdit( aEdit.GetText() );
     sEdit.EraseLeadingChars().EraseTrailingChars();
     if( sEdit.Len() && '=' == sEdit.GetChar( 0 ) )
@@ -594,8 +594,7 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
             nEndPos = nStartPos;
             while( nEndPos < nLen )
             {
-                if( cClose == (cCh = aActText.GetChar( nEndPos )) /*||
-                    cCh == cCloseBracket*/ )
+                if( cClose == (cCh = aActText.GetChar( nEndPos )))
                 {
                     bFound = TRUE;
                     break;
@@ -627,7 +626,6 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
         {
             SetText( aActText );
             SetSelection( Selection( nPos, nPos ) );
-//          GetModifyHdl().Call( this );
         }
     }
     GrabFocus();
@@ -635,7 +633,6 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
 }
 //==================================================================
 
-
 SwInputChild::SwInputChild(Window* _pParent,
                                 USHORT nId,
                                 SfxBindings* pBindings,
@@ -662,26 +659,4 @@ SfxChildWinInfo __EXPORT SwInputChild::GetInfo() const
     return aInfo;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index 0144c5f2c158..6ec08d0fe640 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -121,8 +121,6 @@ void  SwTbxAnchor::Click()
             pDispatch = pViewFrame->GetDispatcher();
     }
 
-//    SfxDispatcher* pDispatch = GetBindings().GetDispatcher();
-//    SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
     SwView* pActiveView = 0;
     if(pViewFrame)
     {
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 23e389683b48..c37d71c6168d 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -58,7 +58,7 @@
 
 #include <vcl/svapp.hxx>
 
-//JP 14.01.99: Size Abpruefung
+// Size Abpruefung
 #define NAVI_ENTRIES 20
 #if NAVI_ENTRIES != NID_COUNT
 #error SwScrollNaviPopup-CTOR static Array falsche Size. Wurden neue IDs zugefuegt ??
@@ -73,9 +73,6 @@ using namespace ::com::sun::star::frame;
 SFX_IMPL_TOOLBOX_CONTROL( SwTbxInsertCtrl, SfxImageItem);
 SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxBoolItem );
 
-/**********************************************************************
-
-**********************************************************************/
 SwTbxInsertCtrl::SwTbxInsertCtrl(
     USHORT nSlotId,
     USHORT nId,
@@ -85,9 +82,7 @@ SwTbxInsertCtrl::SwTbxInsertCtrl(
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
 }
-/**********************************************************************
 
-**********************************************************************/
 SwTbxInsertCtrl::~SwTbxInsertCtrl()
 {
 }
@@ -108,11 +103,6 @@ void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException)
     SfxToolBoxControl::update();
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/,
                                       SfxItemState eState,
                                       const SfxPoolItem* pState )
@@ -144,10 +134,6 @@ void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/,
     }
 
 }
-/**********************************************************************
-
-**********************************************************************/
-
 
 SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
 {
@@ -164,22 +150,12 @@ SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
     return NULL;
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 SfxPopupWindowType  SwTbxInsertCtrl::GetPopupWindowType() const
 {
     return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
 }
 
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 void SwTbxInsertCtrl::Select( BOOL /*bMod1*/ )
 {
     if( nLastSlotId )
@@ -199,11 +175,6 @@ void SwTbxInsertCtrl::Select( BOOL /*bMod1*/ )
     }
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
     USHORT nSlotId,
     USHORT nId,
@@ -214,21 +185,12 @@ SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
 }
-/**********************************************************************
-
-**********************************************************************/
-
 
 SwTbxAutoTextCtrl::~SwTbxAutoTextCtrl()
 {
     DelPopup();
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 {
     pView = ::GetActiveView();
@@ -304,21 +266,11 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 }
 
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 SfxPopupWindowType SwTbxAutoTextCtrl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONTIMEOUT;
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 void SwTbxAutoTextCtrl::StateChanged( USHORT nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState )
@@ -330,11 +282,6 @@ void SwTbxAutoTextCtrl::StateChanged( USHORT nSID,
     }
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
 {
     USHORT nId = pMenu->GetCurItemId();
@@ -392,11 +339,6 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
     return 0;
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 void SwTbxAutoTextCtrl::DelPopup()
 {
     if(pPopup)
@@ -414,9 +356,7 @@ void SwTbxAutoTextCtrl::DelPopup()
     }
 }
 
-/*-----------------19.02.97 10.52-------------------
-    Navigations-Popup
---------------------------------------------------*/
+/* Navigations-Popup */
 // determine the order of the toolbox items
 static USHORT __READONLY_DATA aNavigationInsertIds[ NAVI_ENTRIES ] =
 {
@@ -534,16 +474,11 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr
     aToolBox.StartSelection();
     aToolBox.Show();
 }
-/*-----------------19.02.97 12.45-------------------
-
---------------------------------------------------*/
 
 SwScrollNaviPopup::~SwScrollNaviPopup()
 {
 }
-/* -----------------------------08.05.2002 14:00------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -552,9 +487,7 @@ void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt )
 
     Window::DataChanged( rDCEvt );
 }
-/* -----------------------------08.05.2002 14:02------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwScrollNaviPopup::ApplyImageList()
 {
     ImageList& rImgLst = aToolBox.GetSettings().GetStyleSettings().GetHighContrastMode() ?
@@ -565,19 +498,12 @@ void SwScrollNaviPopup::ApplyImageList()
         aToolBox.SetItemImage(nNaviId, rImgLst.GetImage(nNaviId));
     }
 }
-/*-----------------19.02.97 13.58-------------------
-
---------------------------------------------------*/
 
 SfxPopupWindow* SwScrollNaviPopup::Clone() const
 {
     return new SwScrollNaviPopup( GetId(), GetFrame() );
 }
 
-/*-----------------19.02.97 14.10-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
 {
     USHORT nSet = pSet->GetCurItemId();
@@ -608,9 +534,6 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
     }
     return 0;
 }
-/*-----------------23.02.97 18.21-------------------
-
---------------------------------------------------*/
 
 void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -619,9 +542,6 @@ void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
         ((SwScrollNaviPopup*)GetParent())->EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL );
 }
 
-/*-----------------20.06.97 13:28-------------------
-
---------------------------------------------------*/
 void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
 {
     SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(TRUE));
@@ -630,9 +550,6 @@ void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
 
 }
 
-/*-----------------20.06.97 13:41-------------------
-
---------------------------------------------------*/
 String  SwScrollNaviPopup::GetQuickHelpText(BOOL bNext)
 {
     USHORT nResId = STR_IMGBTN_START;
@@ -641,17 +558,12 @@ String  SwScrollNaviPopup::GetQuickHelpText(BOOL bNext)
         nResId += NID_COUNT;
     return String(SW_RES(nResId));
 }
-/* -----------------------------05.09.2002 13:53------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNaviImageButton::Click()
 {
-//    SfxBindings& rBind = SfxViewFrame::Current()->GetBindings();
-//    rBind.ENTERREGISTRATIONS();
     pPopup = new
         SwScrollNaviPopup( FN_SCROLL_NAVIGATION,
                            m_xFrame );
-//    rBind.LEAVEREGISTRATIONS();
     Point aPos = OutputToScreenPixel(Point(0,0));
     Rectangle aRect(aPos, GetSizePixel());
     SetPopupWindow( pPopup );
@@ -700,10 +612,6 @@ IMPL_LINK( SwNaviImageButton, ClosePopupWindow, SfxPopupWindow *, pWindow )
     return 1;
 }
 
-/*-----------------21.02.97 09:41-------------------
-
---------------------------------------------------*/
-
 void SwHlpImageButton::RequestHelp( const HelpEvent& rHEvt )
 {
 
@@ -712,10 +620,6 @@ void SwHlpImageButton::RequestHelp( const HelpEvent& rHEvt )
     ImageButton::RequestHelp(rHEvt);
 }
 
-/*-----------------25.02.97 12:38-------------------
-
---------------------------------------------------*/
-
 SwNaviImageButton::SwNaviImageButton(
     Window* pParent,
     const Reference< XFrame >& rFrame ) :
@@ -733,9 +637,7 @@ SwNaviImageButton::SwNaviImageButton(
     SetQuickHelpText(sQuickText);
     SetModeImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImageH : aImage);
 }
-/* -----------------------------2002/07/05 9:41-------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNaviImageButton::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -744,9 +646,7 @@ void SwNaviImageButton::DataChanged( const DataChangedEvent& rDCEvt )
 
     Window::DataChanged( rDCEvt );
 }
-/* -----------------26.11.2002 09:28-----------------
- *
- * --------------------------------------------------*/
+
 class SwZoomBox_Impl : public ComboBox
 {
     USHORT          nSlotId;
@@ -767,9 +667,7 @@ protected:
     void ReleaseFocus();
 
 };
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 SwZoomBox_Impl::SwZoomBox_Impl(
     Window* pParent,
     USHORT nSlot,
@@ -789,14 +687,10 @@ SwZoomBox_Impl::SwZoomBox_Impl(
         InsertEntry(sEntry);
     }
 }
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 SwZoomBox_Impl::~SwZoomBox_Impl()
 {}
-/* -----------------26.11.2002 09:34-----------------
- *
- * --------------------------------------------------*/
+
 void    SwZoomBox_Impl::Select()
 {
     if ( !IsTravelSelect() )
@@ -826,9 +720,7 @@ void    SwZoomBox_Impl::Select()
         ReleaseFocus();
     }
 }
-/* -----------------02.12.2002 07:49-----------------
- *
- * --------------------------------------------------*/
+
 long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
 {
     long nHandled = 0;
@@ -865,9 +757,7 @@ long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
 
     return nHandled ? nHandled : ComboBox::Notify( rNEvt );
 }
-/* -----------------02.12.2002 07:51-----------------
- *
- * --------------------------------------------------*/
+
 void SwZoomBox_Impl::ReleaseFocus()
 {
     if ( !bRelease )
@@ -886,9 +776,6 @@ void SwZoomBox_Impl::ReleaseFocus()
     }
 }
 
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
 SFX_IMPL_TOOLBOX_CONTROL( SwPreviewZoomControl, SfxUInt16Item);
 
 SwPreviewZoomControl::SwPreviewZoomControl(
@@ -898,15 +785,11 @@ SwPreviewZoomControl::SwPreviewZoomControl(
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
 }
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 SwPreviewZoomControl::~SwPreviewZoomControl()
 {
 }
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 void SwPreviewZoomControl::StateChanged( USHORT /*nSID*/,
                                          SfxItemState eState,
                                          const SfxPoolItem* pState )
@@ -922,9 +805,7 @@ void SwPreviewZoomControl::StateChanged( USHORT /*nSID*/,
         pBox->SaveValue();
     }
 }
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 Window* SwPreviewZoomControl::CreateItemWindow( Window *pParent )
 {
     SwZoomBox_Impl* pRet = new SwZoomBox_Impl( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ));