Translate German comments, cleanup whitespace

Change-Id: I4cea9568c5f24340c6bdac387efe8e94f8edb95a
Reviewed-on: https://gerrit.libreoffice.org/1568
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

7 files changed, 129 insertions, 192 deletions

diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 28bd60c6454c..9dd3f36c9d9d 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -583,7 +583,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
     {
     case SWTRANSFER_OBJECTTYPE_DRAWMODEL:
         {
-            // dont change the sequence of commands
+            // don't change the sequence of commands
             SdrModel *pModel = (SdrModel*)pObject;
             xStream->SetBufferSize( 16348 );
 
@@ -822,7 +822,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
 
         SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
 
-        pTmpDoc->LockExpFlds();     // nie die Felder updaten - Text so belassen
+        pTmpDoc->LockExpFlds();     // Never update fields - leave text as is
         lclOverWriteDoc(*pWrtShell, *pTmpDoc);
 
         {
@@ -843,7 +843,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
                 pMarkAccess->deleteMark(*ppMark);
         }
 
-        // a new one was created in CORE (OLE-Objekte copied!)
+        // a new one was created in CORE (OLE objects copied!)
         aDocShellRef = pTmpDoc->GetTmpDocShell();
         if( aDocShellRef.Is() )
             SwTransferable::InitOle( aDocShellRef, *pTmpDoc );
@@ -2407,7 +2407,7 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
                         sFileURL, aEmptyStr );
                 if( pFlt && !rSh.GetView().GetDocShell()->ISA(SwWebDocShell) )
                 {
-    // and then pull up the insert-region-dialog by PostUser event
+                // and then pull up the insert-region-dialog by PostUser event
                     SwSectionData * pSect = new SwSectionData(
                                     FILE_LINK_SECTION,
                                     rSh.GetDoc()->GetUniqueSectionName() );
@@ -3053,7 +3053,7 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell )
 {
     // first, ask for the SelectionType, then action-bracketing !!!!
     // (otherwise it's not pasted into a TableSelection!!!)
-    OSL_ENSURE( !rShell.ActionPend(), "Paste darf nie eine Actionklammerung haben" );
+    OSL_ENSURE( !rShell.ActionPend(), "Paste must never have an ActionPend" );
     if ( !pClpDocFac )
         return sal_False; // the return value of the SwFEShell::Paste also is sal_Bool!
 
@@ -3092,7 +3092,7 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell )
 // in the buffer, word in this context means 'something with spaces at beginning
 // and end'. In this case we definitely want these spaces to be inserted here.
             bInWrd = rShell.IsInWrd();
-             bEndWrd = rShell.IsEndWrd();
+            bEndWrd = rShell.IsEndWrd();
             bSmart = bInWrd || bEndWrd;
             if( bSmart )
             {
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index e60787850944..fab1fa86cd11 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -77,7 +77,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
         if( rSh.GetDrawView()->Command( aDragEvent, this ) )
         {
             rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
-            return; // Event von der SdrView ausgewertet
+            return; // Event evaluated by SdrView
         }
     }
 
@@ -218,13 +218,13 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
     }
 
 
-    //                          There's a special treatment for file lists with a single
-    //                          element, that depends on the actual content of the
-    //                          Transferable to be accessible. Since the transferable
-    //                          may only be accessed after the drop has been accepted
-    //                          (according to KA due to Java D&D), we'll have to
-    //                          reevaluate the drop action once more _with_ the
-    //                          Transferable.
+    // There's a special treatment for file lists with a single
+    // element, that depends on the actual content of the
+    // Transferable to be accessible. Since the transferable
+    // may only be accessed after the drop has been accepted
+    // (according to KA due to Java D&D), we'll have to
+    // reevaluate the drop action once more _with_ the
+    // Transferable.
     sal_uInt16 nEventAction;
     sal_Int8 nUserOpt = rEvt.mbDefault ? EXCHG_IN_ACTION_DEFAULT
                                        : rEvt.mnAction;
@@ -415,8 +415,8 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
             }
             else if( rEvt.mbDefault )
             {
-                //              internal Drag&Drop: within same Doc a Move
-                //              otherwise a Copy - Task 54974
+                // internal Drag&Drop: within same Doc a Move
+                // otherwise a Copy - Task 54974
                 nEventAction = pSrcSh->GetDoc() == rSh.GetDoc()
                                     ? DND_ACTION_MOVE
                                     : DND_ACTION_COPY;
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 20ea534254f6..e5ff6f5140ee 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -145,9 +145,9 @@
 using namespace sw::mark;
 using namespace ::com::sun::star;
 
-/*--------------------------------------------------------------------
-    Description:   Globals
- --------------------------------------------------------------------*/
+/**
+ * Globals
+ */
 
 static bool bInputLanguageSwitched = false;
 extern bool bNoInterrupt;       // in mainwn.cxx
@@ -172,13 +172,13 @@ QuickHelpData* SwEditWin::pQuickHlpData = 0;
 
 long    SwEditWin::nDDStartPosY = 0;
 long    SwEditWin::nDDStartPosX = 0;
-/* Note:
-   The initial color shown on the button is set in /core/svx/source/tbxctrls/tbxcolorupdate.cxx
-   (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
-   The initial color used by the button is set in /core/svx/source/tbxcntrls/tbcontrl.cxx
-   (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
-   and in case of writer for text(background)color also in /core/sw/source/ui/docvw/edtwin.cxx
-   (SwEditWin::aTextBackColor and SwEditWin::aTextBackColor)
+/**
+ * The initial color shown on the button is set in /core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ * (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ * The initial color used by the button is set in /core/svx/source/tbxcntrls/tbcontrl.cxx
+ * (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ * and in case of writer for text(background)color also in /core/sw/source/ui/docvw/edtwin.cxx
+ * (SwEditWin::aTextBackColor and SwEditWin::aTextBackColor)
  */
 Color   SwEditWin::aTextBackColor(COL_YELLOW);
 Color   SwEditWin::aTextColor(COL_RED);
@@ -283,9 +283,9 @@ struct QuickHelpData
     void SortAndFilter();
 };
 
-/*--------------------------------------------------------------------
-    Description:   avoid minimal movement shiver
- --------------------------------------------------------------------*/
+/**
+ * Avoid minimal movement shiver
+ */
 
 #define HIT_PIX  2 /* hit tolerance in pixel  */
 #define MIN_MOVE 4
@@ -296,12 +296,12 @@ inline sal_Bool IsMinMove(const Point &rStartPos, const Point &rLPt)
            Abs(rStartPos.Y() - rLPt.Y()) > MIN_MOVE;
 }
 
-/*--------------------------------------------------------------------
-                for MouseButtonDown - determine whether a DrawObject
-                an NO SwgFrame was hit! Shift/Ctrl should only result
-                in selecting, with DrawObjects; at SwgFlys to trigger
-                hyperlinks if applicable (DownLoad/NewWindow!)
- --------------------------------------------------------------------*/
+/**
+ * For MouseButtonDown - determine whether a DrawObject
+ * an NO SwgFrame was hit! Shift/Ctrl should only result
+ * in selecting, with DrawObjects; at SwgFlys to trigger
+ * hyperlinks if applicable (DownLoad/NewWindow!)
+ */
 inline sal_Bool IsDrawObjSelectable( const SwWrtShell& rSh, const Point& rPt )
 {
     sal_Bool bRet = sal_True;
@@ -319,10 +319,9 @@ inline sal_Bool IsDrawObjSelectable( const SwWrtShell& rSh, const Point& rPt )
     return bRet;
 }
 
-/*--------------------------------------------------------------------
-    Description:   switch pointer
- --------------------------------------------------------------------*/
-
+/*
+ * Switch pointer
+ */
 void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
 {
     SwWrtShell &rSh = rView.GetWrtShell();
@@ -571,10 +570,9 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
     }
 }
 
-/*--------------------------------------------------------------------
-    Description: increase timer for selection
- --------------------------------------------------------------------*/
-
+/**
+ * Increase timer for selection
+ */
 IMPL_LINK_NOARG(SwEditWin, TimerHandler)
 {
     DBG_PROFSTART(edithdl);
@@ -659,9 +657,9 @@ inline void SwEditWin::EnterArea()
     aTimer.Stop();
 }
 
-/*------------------------------------------------------------------------
- Description:  insert mode for frames
-------------------------------------------------------------------------*/
+/**
+ * Insert mode for frames
+ */
 
 void SwEditWin::InsFrm(sal_uInt16 nCols)
 {
@@ -838,10 +836,9 @@ static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView&
     return bLang ? nWhich : INVALID_HINT;
 }
 
-/*--------------------------------------------------------------------
-     Description:  character buffer is inserted into the document
- --------------------------------------------------------------------*/
-
+/**
+ * Character buffer is inserted into the document
+ */
 void SwEditWin::FlushInBuffer()
 {
     if ( aInBuffer.Len() )
@@ -1284,10 +1281,9 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir )
     rSh.EndUndo();
 }
 
-/*--------------------------------------------------------------------
-    Description:   KeyEvents
- --------------------------------------------------------------------*/
-
+/**
+ * KeyEvents
+ */
 void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 {
     SwWrtShell &rSh = rView.GetWrtShell();
@@ -2701,10 +2697,9 @@ KEYINPUT_CHECKTABLE_INSDEL:
 
 }
 
-/*--------------------------------------------------------------------
-     Description:  MouseEvents
- --------------------------------------------------------------------*/
-
+/**
+ * MouseEvents
+ */
 void SwEditWin::RstMBDownFlags()
 {
     // Not on all systems a MouseButtonUp is used ahead
@@ -3240,9 +3235,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         if ( !bHandledFlyClick && !bIsDocReadOnly && rSh.IsInsideSelectedObj(aDocPos) &&
                              0 == rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) )
                         {
-/* this is no good, on the one hand GetSelectionType is used as flag field (take a look into the GetSelectionType method)
-   on the other hand the return value is used in a switch without proper masking (very nice), this must lead to trouble
-*/
+                        /* This is no good: on the one hand GetSelectionType is used as flag field
+                         * (take a look into the GetSelectionType method) and on the other hand the
+                         * return value is used in a switch without proper masking (very nice), this must lead to trouble
+                         */
                             switch ( rSh.GetSelectionType() &~ ( nsSelectionType::SEL_FONTWORK | nsSelectionType::SEL_EXTRUDED_CUSTOMSHAPE ) )
                             {
                             case nsSelectionType::SEL_GRF:
@@ -3252,7 +3248,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                                     SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT);
                                 return;
 
-                                // double click on OLE object --> OLE-InPlace
+                            // double click on OLE object --> OLE-InPlace
                             case nsSelectionType::SEL_OLE:
                                 if (!rSh.IsSelObjProtected(FLYPROTECT_CONTENT))
                                 {
@@ -3371,7 +3367,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         return;
                 }
             }
-                /* no break */
+            /* no break */
             case MOUSE_LEFT + KEY_SHIFT:
             case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1:
             {
@@ -3628,10 +3624,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         Window::MouseButtonDown(rMEvt);
 }
 
-/*--------------------------------------------------------------------
-    Description:   MouseMove
- --------------------------------------------------------------------*/
-
+/**
+ * MouseMove
+ */
 void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 {
     MouseEvent rMEvt(_rMEvt);
@@ -3903,7 +3898,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                         if( 0 != ( pFlyFmt = rSh.GetFlyFrmFmt() ) &&
                             0 != ( pMacro = pFlyFmt->GetMacro().GetMacroTable().
                             Get( nEvent )) &&
-// or notify only e.g. every 20 Twip?
+                        // or notify only e.g. every 20 Twip?
                             aRszMvHdlPt != aDocPt )
                         {
                             aRszMvHdlPt = aDocPt;
@@ -4118,10 +4113,9 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
     bWasShdwCrsr = sal_False;
 }
 
-/*--------------------------------------------------------------------
-    Description:   Button Up
- --------------------------------------------------------------------*/
-
+/**
+ * Button Up
+ */
 void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 {
     sal_Bool bCallBase = sal_True;
@@ -4157,8 +4151,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
     // only process MouseButtonUp when the Down went to that windows as well.
     if ( !bMBPressed )
     {
-// Undo for the watering can is already in CommandHdl
-// that's the way it should be!
+    // Undo for the watering can is already in CommandHdl
+    // that's the way it should be!
 
         return;
     }
@@ -4279,8 +4273,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                             rSh.EndUndo( UNDO_UI_DRAG_AND_COPY );
                         }
                     }
-                    else
+                    else {
                         rSh.EndDrag( &aDocPt, false );
+                    }
                 }
                 else
                 {
@@ -4639,7 +4634,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                     break;
                 }
                 case SFX_STYLE_FAMILY_PAGE:
-                            // no Undo with page templates
+                    // no Undo with page templates
                     rSh.ChgCurPageDesc( *pApplyTempl->aColl.pPageDesc );
                     if ( pApplyTempl->aColl.pPageDesc )
                         aStyleName = pApplyTempl->aColl.pPageDesc->GetName();
@@ -4680,8 +4675,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
     // be resetted.
     bMBPressed = sal_False;
 
-    //sicherheitshalber aufrufen, da jetzt das Selektieren bestimmt zu Ende ist.
-    //Andernfalls koennte der Timeout des Timers Kummer machen.
+    // Make this call just to be sure. Selecting has finished surely by now.
+    // Otherwise the timeout's timer could give problems.
     EnterArea();
     bNoInterrupt = false;
 
@@ -4689,10 +4684,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
         Window::MouseButtonUp(rMEvt);
 }
 
-/*--------------------------------------------------------------------
-    Description:   apply template
- --------------------------------------------------------------------*/
-
+/**
+ * Apply template
+ */
 void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
 {
     static sal_Bool bIdle = sal_False;
@@ -4743,10 +4737,9 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
     rView.GetViewFrame()->GetBindings().Invalidate(aInva);
 }
 
-/*--------------------------------------------------------------------
-    Description:   ctor
- --------------------------------------------------------------------*/
-
+/**
+ * Ctor
+ */
 SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
     Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)),
     DropTargetHelper( this ),
@@ -4803,7 +4796,7 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
     aTemplateTimer.SetTimeoutHdl(LINK(this, SwEditWin, TemplateTimerHdl));
 
     // temporary solution!!! Should set the font of the current
-    //          insert position at every curor movement!
+    // insert position at every curor movement!
     if( !rMyView.GetDocShell()->IsReadOnly() )
     {
         Font aFont;
@@ -4827,10 +4820,9 @@ SwEditWin::~SwEditWin()
     delete pAnchorMarker;
 }
 
-/******************************************************************************
- *  Description: turn on DrawTextEditMode
- ******************************************************************************/
-
+/**
+ * Turn on DrawTextEditMode
+ */
 void SwEditWin::EnterDrawTextMode( const Point& aDocPos )
 {
     if ( rView.EnterDrawTextMode(aDocPos) == sal_True )
@@ -4846,10 +4838,9 @@ void SwEditWin::EnterDrawTextMode( const Point& aDocPos )
     }
 }
 
-/******************************************************************************
- *  Description: turn on DrawMode
- ******************************************************************************/
-
+/**
+ * Turn on DrawMode
+ */
 sal_Bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
 {
     SwWrtShell &rSh = rView.GetWrtShell();
@@ -5552,7 +5543,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
     }
     else if ( rSh.IsSelFrmMode() && bIsInsideSelectedObj )
     {
-        // ## object at the mouse cursor is already selected - do nothing
+        // Object at the mouse cursor is already selected - do nothing
         return sal_False;
     }
 
@@ -5862,7 +5853,7 @@ struct EqualIgnoreCaseAscii
 
 } // anonymous namespace
 
-// TODO - implement an i18n aware sort
+// TODO Implement an i18n aware sort
 void QuickHelpData::SortAndFilter()
 {
     std::sort( m_aHelpStrings.begin(),
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index 68446c477f2d..d055aa57f2ce 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -39,10 +39,9 @@ class SwRect;
 class DataChangedEvent;
 class CommandEvent;
 class SvtAccessibilityOptions;
-// OD 12.12.2002 #103492#
 class SwPagePreviewLayout;
 
-// OD 24.03.2003 #108282# - delete member <mnVirtPage> and its accessor.
+// Delete member <mnVirtPage> and its accessor
 class SwPagePreViewWin : public Window
 {
     ViewShell*          mpViewShell;
@@ -51,10 +50,8 @@ class SwPagePreViewWin : public Window
     Size                maPxWinSize;
     Fraction            maScale;
     SwPagePreView&      mrView;
-    // OD 02.12.2002 #103492#
     bool                mbCalcScaleForPreviewLayout;
     Rectangle           maPaintedPreviewDocRect;
-    // OD 12.12.2002 #103492#
     SwPagePreviewLayout* mpPgPrevwLayout;
 
     void SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol );
@@ -87,26 +84,18 @@ public:
 
     /** get selected page number of document preview
 
-        OD 13.12.2002 #103492#
-
-        @author OD
-
         @return selected page number
     */
     sal_uInt16 SelectedPage() const;
 
     /** set selected page number in document preview
 
-        OD 13.12.2002 #103492#
-
-        @author OD
-
         @param _nSelectedPageNum
         input parameter - physical page number of page that will be the selected one.
     */
     void SetSelectedPage( sal_uInt16 _nSelectedPageNum );
 
-    //JP 19.08.98: bei Einspaltigkeit gibt es keine 0. Seite!
+    // If we only have one column we do not have a oth page
     sal_uInt16  GetDefSttPage() const   { return 1 == mnCol ? 1 : 0; }
 
     void CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol );
@@ -114,24 +103,20 @@ public:
     const Size& GetWinSize() const  { return maPxWinSize; }
     void SetWinSize( const Size& rNewSize );
 
-    // OD 18.12.2002 #103492# - add <MV_SELPAGE>, <MV_SCROLL>
+    // Add <MV_SELPAGE>, <MV_SCROLL>
     enum MoveMode{ MV_CALC, MV_PAGE_UP, MV_PAGE_DOWN, MV_DOC_STT, MV_DOC_END,
                    MV_SELPAGE, MV_SCROLL, MV_NEWWINSIZE };
     int MovePage( int eMoveMode );
 
-    // erzeuge den String fuer die StatusLeiste
+    // Create the status bar's string
     OUString GetStatusStr( sal_uInt16 nPageCount ) const;
 
     void RepaintCoreRect( const SwRect& rRect );
 
-    /** method to adjust preview to a new zoom factor
-
-        OD 02.12.2002 #103492#
+    /** Method to adjust preview to a new zoom factor
         paint of preview is prepared for a new zoom factor
-        OD 24.09.2003 #i19975# - zoom type has also been considered.
+        Zoom type has also been considered.
         Thus, add new parameter <_eZoomType>
-
-        @author OD
     */
     void AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor,
                                  const SvxZoomType _eZoomType );
@@ -143,12 +128,7 @@ public:
 
     void Scroll(long nXMove, long nYMove, sal_uInt16 nFlags = 0);
 
-    /** method to enable/disable book preview
-
-        OD 2004-03-05 #i18143#
-
-        @author OD
-
+    /** Method to enable/disable book preview
         @param _bBookPreview
         input parameter - boolean indicating, if book preview mode has to
         switch on <sal_True> or of <sal_False>
@@ -162,9 +142,9 @@ public:
                     CreateAccessible();
 };
 
-/*--------------------------------------------------------------------
-    Description:   view of a document
- --------------------------------------------------------------------*/
+/**
+ * View of a document
+ */
 class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
 {
     // ViewWindow and handle to core
@@ -194,8 +174,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
     sal_uInt16                  mnPageCount;
     sal_Bool                    bNormalPrint;
 
-    // OD 09.01.2003 #106334#
-    // new members to reset design mode at draw view for form shell on switching
+    // New members to reset design mode at draw view for form shell on switching
     // back from writer page preview to normal view.
     sal_Bool                mbResetFormDesignMode:1;
     sal_Bool                mbFormDesignModeToReset:1;
@@ -218,9 +197,7 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
 
     SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner );
 
-    /** help method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN
-
-        OD 04.03.2003 #107369#
+    /** Helper method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN
 
         @param _bPgUp
         input parameter - boolean that indicates, if FN_PAGE_UP or FN_PAGE_DOWN
@@ -228,8 +205,6 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
 
         @param _pReq
         optional input parameter - pointer to the <SfxRequest> instance, if existing.
-
-        @author OD
     */
     SW_DLLPRIVATE void _ExecPgUpAndPgDown( const bool  _bPgUp,
                              SfxRequest* _pReq = 0 );
@@ -279,17 +254,17 @@ public:
     sal_uInt16          GetNewPage() const {return nNewPage;}
     void            SetNewPage(sal_uInt16 nSet)  {nNewPage = nSet;}
 
-        // handler
+    // Handler
     void            Execute(SfxRequest&);
     void            GetState(SfxItemSet&);
     void            StateUndo(SfxItemSet&);
 
     SwDocShell*     GetDocShell();
 
-    //apply Accessiblity options
+    // apply Accessiblity options
     void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions);
 
-    // OD 09.01.2003 #106334# - inline method to request values of new members
+    // Inline method to request values of new members
     // <mbResetFormDesignMode> and <mbFormDesignModeToReset>
     inline sal_Bool ResetFormDesignMode() const
     {
@@ -301,14 +276,11 @@ public:
         return mbFormDesignModeToReset;
     }
 
-    /** adjust position of vertical scrollbar
+    /** Adjust position of vertical scrollbar
 
-        OD 19.02.2003 #107369
         Currently used, if the complete preview layout rows fit into to the given
         window, if a new page is selected and this page is visible.
 
-        @author OD
-
         @param _nNewThumbPos
         input parameter - new position, which will be assigned to the vertical
         scrollbar.
diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx
index 8101d6ced656..c3a95f8a3b81 100644
--- a/sw/source/ui/inc/uitool.hxx
+++ b/sw/source/ui/inc/uitool.hxx
@@ -73,7 +73,7 @@ SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, sal
 //inserts a string sorted into a ListBox,
 SW_DLLPUBLIC sal_uInt16 InsertStringSorted(const String& rEntry, ListBox& rToFill, sal_uInt16 nOffset);
 
-// Tabellenbreite und Ausrichtung ermitteln
+// Get table width and alignement
 SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent,
         SwWrtShell* pSh );
 
diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/ui/ribbar/conform.cxx
index 2a0d494de79c..fca2c510656f 100644
--- a/sw/source/ui/ribbar/conform.cxx
+++ b/sw/source/ui/ribbar/conform.cxx
@@ -29,26 +29,18 @@
 
 extern bool bNoInterrupt;       // in mainwn.cxx
 
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
-
+/**
+ * Ctor
+ */
 ConstFormControl::ConstFormControl(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) :
     SwDrawBase(pWrtShell, pEditWin, pSwView)
 {
     m_bInsForm = sal_True;
 }
 
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
-
+/**
+ * MouseButtonDown event
+ */
 sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
 {
     sal_Bool bReturn = sal_False;
@@ -72,7 +64,7 @@ sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
     SdrViewEvent aVEvt;
     SdrHitKind eHit = pSdrView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
 
-    // Nur neues Objekt, wenn nicht im Basismode (bzw reinem Selektionsmode)
+    // Only new object; if not in base mode (or pure selection mode)
     if (rMEvt.IsLeft() && !m_pWin->IsDrawAction() &&
         (eHit == SDRHIT_UNMARKEDOBJECT || eHit == SDRHIT_NONE || m_pSh->IsDrawCreate()))
     {
@@ -93,13 +85,9 @@ sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
     return (bReturn);
 }
 
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
-
-
+/**
+ * Activate
+ */
 void ConstFormControl::Activate(const sal_uInt16 nSlotId)
 {
     m_pWin->SetSdrDrawMode( static_cast<SdrObjKind>(nSlotId) );
diff --git a/sw/source/ui/ribbar/conrect.cxx b/sw/source/ui/ribbar/conrect.cxx
index ab5f95c2ff30..bb3cf919a27e 100644
--- a/sw/source/ui/ribbar/conrect.cxx
+++ b/sw/source/ui/ribbar/conrect.cxx
@@ -37,12 +37,9 @@
 #include <conrect.hxx>
 
 
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
+/**
+ * Ctor
+ */
 ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin,
                                 SwView* pSwView )
     : SwDrawBase( pWrtShell, pEditWin, pSwView ),
@@ -52,12 +49,9 @@ ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin,
 {
 }
 
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
+/**
+ * MouseButtonDown event
+ */
 sal_Bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
 {
     sal_Bool bReturn;
@@ -75,12 +69,9 @@ sal_Bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
     return (bReturn);
 }
 
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
+/**
+ * MouseButtonUp event
+ */
 sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
 {
     sal_Bool bRet = SwDrawBase::MouseButtonUp(rMEvt);
@@ -99,7 +90,7 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
 
                 if( pObj )
                 {
-                    // die fuer das Scrollen benoetigten Attribute setzen
+                    // Set the attributes needed for scrolling
                     SfxItemSet aItemSet( pSdrView->GetModel()->GetItemPool(),
                                         SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
 
@@ -116,7 +107,6 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
             }
             else if(mbVertical && pObj && pObj->ISA(SdrTextObj))
             {
-                // #93382#
                 SdrTextObj* pText = (SdrTextObj*)pObj;
                 SfxItemSet aSet(pSdrView->GetModel()->GetItemPool());
 
@@ -134,7 +124,7 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
                 SdrPageView* pPV = pSdrView->GetSdrPageView();
                 m_pView->BeginTextEdit( pObj, pPV, m_pWin, sal_True );
             }
-            m_pView->LeaveDrawCreate();  // In Selektionsmode wechseln
+            m_pView->LeaveDrawCreate();  // Switch to selection mode
             m_pSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW);
             break;
 
@@ -156,12 +146,9 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
     return bRet;
 }
 
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
-
+/**
+ * Activate
+ */
 void ConstRectangle::Activate(const sal_uInt16 nSlotId)
 {
     bMarquee = bCapVertical = sal_False;
@@ -187,7 +174,6 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId)
         break;
 
     case SID_DRAW_TEXT_VERTICAL:
-        // #93382#
         mbVertical = sal_True;
         m_pWin->SetSdrDrawMode(OBJ_TEXT);
         break;