[Libreoffice-commits] .: sw/inc sw/source

Michael Meeks mmeeks at kemper.freedesktop.org
Mon Nov 1 13:54:25 PDT 2010


 sw/inc/accmap.hxx                |   28 ---
 sw/inc/anchoreddrawobject.hxx    |   38 ----
 sw/inc/dcontact.hxx              |   94 +---------
 sw/inc/doc.hxx                   |  123 ++------------
 sw/inc/ndtxt.hxx                 |   83 +--------
 sw/inc/unotbl.hxx                |   43 -----
 sw/inc/viewsh.hxx                |   36 ----
 sw/inc/viscrs.hxx                |   11 -
 sw/source/ui/docvw/PostItMgr.cxx |  110 ------------
 sw/source/ui/docvw/edtwin.cxx    |  334 ++++++++-------------------------------
 sw/source/ui/frmdlg/frmpage.cxx  |   86 ++--------
 11 files changed, 166 insertions(+), 820 deletions(-)

New commits:
commit 13de34e027fa2768a1e40962f1ef2b056d91054a
Author: Robert Roth <robert.roth.off at gmail.com>
Date:   Mon Nov 1 02:50:47 2010 +0200

    Commented out code, bogus comments removed, some german comments translated.

diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 7170d76..0bffbcb 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -67,12 +67,8 @@ class Window;
 #define ACC_STATE_OPAQUE 0x02
 
 // pseudo states for events
-// --> OD 2009-01-07 #i88069# - pseudo state for event TEXT_ATTRIBUTE_CHANGED
 #define ACC_STATE_TEXT_ATTRIBUTE_CHANGED 0x0200
-// <--
-// --> OD 2005-12-12 #i27301# - pseudo state for event TEXT_SELECTION_CHANGED
 #define ACC_STATE_TEXT_SELECTION_CHANGED 0x0100
-// <--
 #define ACC_STATE_CARET 0x80
 #define ACC_STATE_RELATION_FROM 0x40
 #define ACC_STATE_RELATION_TO 0x20
@@ -81,9 +77,7 @@ class Window;
 
 #define ACC_STATE_MASK 0x1F
 
-// --> OD 2005-12-12 #i27301# - introduce type definition of states
 typedef sal_uInt16 tAccessibleStates;
-// <--
 
 class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
                         public accessibility::IAccessibleParent
@@ -95,10 +89,9 @@ class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
     SwShapeList_Impl *mpShapes;
     SwAccessibleEventList_Impl *mpEvents;
     SwAccessibleEventMap_Impl *mpEventMap;
-    // --> OD 2005-12-13 #i27301# - data structure to keep information about
+    // #i27301 data structure to keep information about
     // accessible paragraph, which have a selection.
     SwAccessibleSelectedParas_Impl* mpSelectedParas;
-    // <--
     ViewShell *mpVSh;
     /// for page preview: store preview data, VisArea, and mapping of
     /// preview-to-display coordinates
@@ -133,7 +126,6 @@ class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
     /** method to build up a new data structure of the accessible pararaphs,
         which have a selection
 
-        OD 2005-12-13 #i27301#
         Important note: method has to used inside a mutual exclusive section
 
         @author OD
@@ -148,8 +140,6 @@ public:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> GetDocumentView();
 
-    // OD 15.01.2003 #103492# - complete re-factoring of method due to new
-    // page/print preview functionality.
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> GetDocumentPreview(
                             const std::vector<PrevwPage*>& _rPrevwPages,
@@ -184,10 +174,6 @@ public:
 
     /** get size of a dedicated preview page
 
-        OD 15.01.2003 #103492#
-        complete re-factoring of previous method due to new page/print preview
-        functionality.
-
         @author OD
 
         @param _nPrevwPageNum
@@ -213,9 +199,7 @@ public:
 
     void InvalidateContent( const SwFrm *pFrm );
 
-    // --> OD 2009-01-06 #i88069#
     void InvalidateAttr( const SwTxtFrm& rTxtFrm );
-    // <--
 
     void InvalidateCursorPosition( const SwFrm *pFrm );
     void InvalidateFocus();
@@ -225,7 +209,6 @@ public:
 
     // Invalidate state of whole tree. If an action is open, this call
     // is processed when the last action ends.
-    // --> OD 2005-12-12 #i27301# - use new type definition for <_nStates>
     void InvalidateStates( tAccessibleStates _nStates,
                            const SwFrm* _pFrm = 0 );
 
@@ -233,8 +216,6 @@ public:
 
     /** invalidation CONTENT_FLOWS_FROM/_TO relation of a paragraph
 
-        OD 2005-12-01 #i27138#
-
         @author OD
 
         @param _rTxtFrm
@@ -250,16 +231,12 @@ public:
 
     /** invalidation of text selection of a paragraph
 
-        OD 2005-12-12 #i27301#
-
         @author OD
     */
     void InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm );
 
     /** invalidation of text selection of all paragraphs
 
-        OD 2005-12-13 #i27301#
-
         @author OD
     */
     void InvalidateTextSelectionOfAllParas();
@@ -268,8 +245,6 @@ public:
                              Window& rChild ) const;
 
     // update preview data (and fire events if necessary)
-    // OD 15.01.2003 #103492# - complete re-factoring of method due to new
-    // page/print preview functionality.
     void UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages,
                         const Fraction&  _rScale,
                         const SwPageFrm* _pSelectedPageFrm,
@@ -306,7 +281,6 @@ public:
 private:
     /** get mapping mode for LogicToPixel and PixelToLogic conversions
 
-        OD 15.01.2003 #103492#
         Replacement method <PreviewAdjust(..)> by new method <GetMapMode>.
         Method returns mapping mode of current output device and adjusts it,
         if the shell is in page/print preview.
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index d8f5636..f191cc7 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,8 +33,6 @@
 
 /** class for the positioning of drawing objects
 
-    OD 2004-03-25 #i26791#
-
     @author OD
 */
 class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
@@ -45,7 +43,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         bool mbValidPos;
 
         // rectangle, keeping the last object rectangle after the postioning
-        // --> OD 2004-09-29 #i34748# - change <maLastObjRect> to a pointer
         Rectangle* mpLastObjRect;
 
         // boolean, indicating that anchored drawing object hasn't been attached
@@ -53,23 +50,21 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         // boolean changes its state.
         bool mbNotYetAttachedToAnchorFrame;
 
-        // --> OD 2004-08-09 #i28749# - boolean, indicating that anchored
+        // boolean, indicating that anchored
         // drawing object hasn't been positioned yet. Once, it's positioned the
         // boolean changes its state.
         bool mbNotYetPositioned;
 
-        // --> OD 2006-03-17 #i62875#
         // boolean, indicating that after change of layout direction the
         // anchored drawing object has to be captured on the page, if it exceeds
         // the left or right page margin.
         // Needed for compatibility option <DoNotCaptureDrawObjsOnPage>
         bool mbCaptureAfterLayoutDirChange;
-        // <--
 
         /** method for the intrinsic positioning of a at-paragraph|at-character
             anchored drawing object
 
-            OD 2004-08-12 #i32795# - helper method for method <MakeObjPos>
+            helper method for method <MakeObjPos>
 
             @author OD
         */
@@ -78,7 +73,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         /** method for the intrinsic positioning of a at-page|at-frame anchored
             drawing object
 
-            OD 2004-08-12 #i32795# - helper method for method <MakeObjPos>
+            helper method for method <MakeObjPos>
 
             @author OD
         */
@@ -86,7 +81,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
 
             /** method to set positioning attributes (not for as-character anchored)
 
-            OD 2004-10-20 #i35798#
             During load the positioning attributes aren't set.
             Thus, the positioning attributes are set by the current object geometry.
             This method is also used for the conversion for drawing objects
@@ -115,8 +109,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
 
         /** method to invalidate the given page frame
 
-            OD 2004-07-02 #i28701#
-
             @author OD
         */
         void _InvalidatePage( SwPageFrm* _pPageFrm );
@@ -127,20 +119,15 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         /** method to assure that anchored object is registered at the correct
             page frame
 
-            OD 2004-07-02 #i28701#
-
             @author OD
         */
         virtual void RegisterAtCorrectPage();
 
-        // --> OD 2006-08-10 #i68520#
         virtual bool _SetObjTop( const SwTwips _nTop);
         virtual bool _SetObjLeft( const SwTwips _nLeft);
-        // <--
 
-        // --> OD 2006-10-05 #i70122#
         virtual const SwRect GetObjBoundRect() const;
-        // <--
+
     public:
         TYPEINFO();
 
@@ -161,23 +148,18 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
 
         // accessors to the object area and its position
         virtual const SwRect GetObjRect() const;
-        // --> OD 2004-09-29 #i34748# - change return type to a pointer.
         // Return value can be NULL.
         const Rectangle* GetLastObjRect() const;
-        // <--
-        // --> OD 2004-09-29 #i34748# - change method
+
         void SetLastObjRect( const Rectangle& _rNewObjRect );
-        // <--
 
         /** adjust positioning and alignment attributes for new anchor frame
 
-            OD 2004-04-21
             Set horizontal and vertical position/alignment to manual position
             relative to anchor frame area using the anchor position of the
             new anchor frame and the current absolute drawing object position.
             Note: For correct Undo/Redo method should only be called inside a
             Undo-/Redo-action.
-            OD 2004-08-24 #i33313# - add second optional parameter <_pNewObjRect>
 
             @author OD
 
@@ -193,29 +175,21 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
 
         /** method to notify background of drawing object
 
-            OD 2004-06-30 #i28701#
-
             @author OD
         */
         virtual void NotifyBackground( SwPageFrm* _pPageFrm,
                                        const SwRect& _rRect,
                                        PrepareHint _eHint );
 
-        // --> OD 2005-08-16 #i53320#
         inline bool NotYetPositioned() const
         {
             return mbNotYetPositioned;
         }
-        // <--
 
-        // --> OD 2006-03-17 #i62875#
         // change of layout direction needs to be tracked
         // for setting <mbCaptureAfterLayoutDirChange>.
         virtual void UpdateLayoutDir();
-        // <--
-        // --> OD 2006-03-17 #i62875#
         bool IsOutsidePage() const;
-        // <--
 
         // new Loop control
         void ValidateThis() { mbValidPos = true; }
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index dfa869a..6f8b48e 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -29,14 +29,10 @@
 #define	_DCONTACT_HXX
 
 #include <svx/svdobj.hxx>
-// OD 14.05.2003 #108784#
 #include <svx/svdovirt.hxx>
-// OD 2004-01-16 #110582#
 #include <swtypes.hxx>
 #include <fmtanchr.hxx>
 #include <frmfmt.hxx>
-
-// OD 17.06.2003 #108784#
 #include <list>
 
 #include "calbck.hxx"
@@ -51,12 +47,10 @@ class SwVirtFlyDrawObj;
 class SwFmtAnchor;
 class SwFlyDrawObj;
 class SwRect;
-// OD 17.06.2003 #108784# - forward declaration for class <SwDrawVirtObj>
+// forward declaration for class <SwDrawVirtObj>
 class SwDrawContact;
-// OD 2004-01-16 #110582#
 struct SwPosition;
 class SwIndex;
-// OD 2004-03-25 #i26791#
 #include <anchoreddrawobject.hxx>
 
 //Der Umgekehrte Weg: Sucht das Format zum angegebenen Objekt.
@@ -77,12 +71,9 @@ void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor );
 void ClrContourCache( const SdrObject *pObj );
 
 // liefert BoundRect inklusive Abstand
-// --> OD 2006-08-15 #i68520# - change naming
 SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj );
-// <--
 
 //Liefert den UserCall ggf. vom Gruppenobjekt
-// OD 2004-03-31 #i26791# - change return type
 SwContact* GetUserCall( const SdrObject* );
 
 // liefert TRUE falls das SrdObject ein Marquee-Object (Lauftext) ist
@@ -91,14 +82,13 @@ BOOL IsMarqueeTextObj( const SdrObject& rObj );
 //Basisklasse fuer die folgenden KontaktObjekte (Rahmen+Zeichenobjekte)
 class SwContact : public SdrObjUserCall, public SwClient
 {
-    // OD 05.09.2003 #112039# - boolean, indicating destruction of contact object
+    // boolean, indicating destruction of contact object
     // important note: boolean has to be set at the beginning of each destructor
     //                 in the subclasses using method <SetInDTOR()>.
     bool mbInDTOR;
 
     /** method to move object to visible/invisible layer
 
-        OD 21.08.2003 #i18447#
         Implementation for the public method <MoveObjToVisibleLayer(..)>
         and <MoveObjToInvisibleLayer(..)>
         If object is in invisble respectively visible layer, its moved to
@@ -108,7 +98,6 @@ class SwContact : public SdrObjUserCall, public SwClient
         aren't on the same layer as the group object, and
         <SdrObjGroup::SetLayer(..)|NbcSetLayer(..)> sets also the layer of
         the members.
-        OD 2004-01-15 #110582# - moved from subclass <SwDrawContact>
 
         @author OD
 
@@ -124,7 +113,6 @@ class SwContact : public SdrObjUserCall, public SwClient
                           SdrObject* _pDrawObj );
 
 protected:
-    // OD 05.09.2003 #112039# - accessor to set member <mbInDTOR>
     void SetInDTOR();
 
 public:
@@ -134,12 +122,9 @@ public:
     SwContact( SwFrmFmt *pToRegisterIn );
     virtual ~SwContact();
 
-    // OD 2004-03-29 #i26791#
     virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const = 0;
     virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) = 0;
 
-    // OD 13.05.2003 #108784# - made methods virtual and not inline
-    // OD 2004-04-01 #i26791# - made methods pure virtual
     virtual const SdrObject *GetMaster() const = 0;
     virtual SdrObject *GetMaster() = 0;
     virtual void SetMaster( SdrObject* _pNewMaster ) = 0;
@@ -148,14 +133,11 @@ public:
     const SwFrmFmt	*GetFmt() const
         { return (const SwFrmFmt*)GetRegisteredIn(); }
 
-    // OD 05.09.2003 #112039# - accessor for member <mbInDTOR>
     bool IsInDTOR() const;
 
     /** method to move drawing object to corresponding visible layer
 
-        OD 21.08.2003 #i18447#
         uses method <_MoveObjToLayer(..)>
-        OD 2004-01-15 #110582# - moved from subclass <SwDrawContact> and made virtual
 
         @author OD
 
@@ -166,9 +148,7 @@ public:
 
     /** method to move drawing object to corresponding invisible layer
 
-        OD 21.08.2003 #i18447#
         uses method <_MoveObjToLayer(..)>
-        OD 2004-01-15 #110582# - moved from subclass <SwDrawContact> and made virtual.
 
         @author OD
 
@@ -178,7 +158,7 @@ public:
     virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj );
 
     // -------------------------------------------------------------------------
-    // OD 2004-01-16 #110582# - some virtual helper methods for information
+    // some virtual helper methods for information
     // about the object (Writer fly frame resp. drawing object)
     const SwFmtAnchor& GetAnchorFmt() const
     {
@@ -209,25 +189,16 @@ public:
 
     /** get data collection of anchored objects, handled by with contact
 
-        OD 2004-08-23 #110810#
-
-        @author
     */
     virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const = 0;
 
     /** get minimum order number of anchored objects handled by with contact
 
-        OD 2004-08-24 #110810#
-
-        @author
     */
     sal_uInt32 GetMinOrdNum() const;
 
     /** get maximum order number of anchored objects handled by with contact
 
-        OD 2004-08-24 #110810#
-
-        @author
     */
     sal_uInt32 GetMaxOrdNum() const;
 };
@@ -238,12 +209,10 @@ public:
 class SW_DLLPUBLIC SwFlyDrawContact : public SwContact
 {
 private:
-    // OD 2004-04-01 #i26791#
     SwFlyDrawObj* mpMasterObj;
 
     /** method to determine new order number for new instance of <SwVirtFlyDrawObj>
 
-        OD 2004-08-16 #i27030#
         Used in method <CreateNewRef(..)>.
 
         @author OD
@@ -257,21 +226,19 @@ public:
     SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod );
     virtual ~SwFlyDrawContact();
 
-    // OD 2004-03-29 #i26791#
     virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const;
     virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj );
 
-    // OD 2004-04-01 #i26791#
     virtual const SdrObject* GetMaster() const;
     virtual SdrObject* GetMaster();
     virtual void SetMaster( SdrObject* _pNewMaster );
 
     SwVirtFlyDrawObj* CreateNewRef( SwFlyFrm* pFly );
 
-    // virtuelle Methoden von SwClient
+    // virtual methods from SwClient
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
 
-    // OD 2004-01-16 #110582# - override methods to control Writer fly frames,
+    // override methods to control Writer fly frames,
     // which are linked, and to assure that all objects anchored at/inside the
     // Writer fly frame are also made visible/invisible.
     virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj );
@@ -279,20 +246,17 @@ public:
 
     /** get data collection of anchored objects handled by with contact
 
-        OD 2004-08-23 #110810#
-
-        @author
     */
     virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const;
 };
 
-// OD 16.05.2003 #108784# - new class for re-direct methods calls at a 'virtual'
+// new class for re-direct methods calls at a 'virtual'
 //      drawing object to its referenced object.
 class SwDrawVirtObj : public SdrVirtObj
 {
     private:
         // data for connection to writer layout
-        // OD 2004-03-25 #i26791# - anchored drawing object instance for the
+        // anchored drawing object instance for the
         // 'virtual' drawing object
         SwAnchoredDrawObject maAnchoredDrawObj;
 
@@ -317,14 +281,12 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual ~SwDrawVirtObj();
 
         // access to offset
-        // OD 30.06.2003 #108784# - virtual!!!
         virtual const Point GetOffset() const;
 
         virtual SdrObject* Clone() const;
         virtual void operator=( const SdrObject& rObj );
 
         // connection to writer layout
-        // OD 2004-03-29 #i26791#
         const SwAnchoredObject* GetAnchoredObj() const;
         SwAnchoredObject* AnchoredObj();
         const SwFrm* GetAnchorFrm() const;
@@ -341,7 +303,6 @@ class SwDrawVirtObj : public SdrVirtObj
 
         virtual void NbcSetAnchorPos(const Point& rPnt);
 
-        // #108784#
         // All overloaded methods which need to use the offset
         virtual void RecalcBoundRect();
         virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const;
@@ -369,10 +330,8 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual Point GetPoint(sal_uInt32 i) const;
         virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
 
-        // #108784#
         virtual bool HasTextEdit() const;
 
-        // OD 17.06.2003 #108784# - overload 'layer' methods
         virtual SdrLayerID GetLayer() const;
         virtual void NbcSetLayer(SdrLayerID nLayer);
         virtual void SetLayer(SdrLayerID nLayer);
@@ -381,43 +340,38 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual bool supportsFullDrag() const;
         virtual SdrObject* getFullDragClone() const;
 
-        // #i97197#
         virtual void SetBoundRectDirty();
         virtual const Rectangle& GetCurrentBoundRect() const;
         virtual const Rectangle& GetLastBoundRect() const;
 };
 
-// OD 26.06.2003 #108784#
 bool CheckControlLayer( const SdrObject *pObj );
 
 //KontactObjekt fuer die Verbindung von Formaten als Repraesentanten der
 //Zeichenobjekte im StarWriter (SwClient) und den Objekten selbst im Drawing
 //(SdrObjUserCall).
 
-// --> OD 2006-01-18 #129959#
 class NestedUserCallHdl;
-// <--
 
 class SwDrawContact : public SwContact
 {
     private:
-        // OD 2004-03-25 #i26791# - anchored drawing object instance for the
+        // anchored drawing object instance for the
         // 'master' drawing object
         SwAnchoredDrawObject maAnchoredDrawObj;
 
-        // OD 16.05.2003 #108784# - data structure for collecting 'virtual'
+        // data structure for collecting 'virtual'
         // drawing object supporting drawing objects in headers/footers.
         std::list<SwDrawVirtObj*> maDrawVirtObjs;
 
-        // OD 2004-04-01 #i26791# - boolean indicating set 'master' drawing
+        // boolean indicating set 'master' drawing
         // object has been cleared.
         bool mbMasterObjCleared : 1;
 
-        // OD 10.10.2003 #112299# - internal flag to indicate that disconnect
+        // internal flag to indicate that disconnect
         // from layout is in progress
         bool mbDisconnectInProgress : 1;
 
-        // --> OD 2006-01-18 #129959#
         // Needed data for handling of nested <SdrObjUserCall> events in
         // method <_Changed(..)>
         bool mbUserCallActive : 1;
@@ -426,7 +380,6 @@ class SwDrawContact : public SwContact
         SdrUserCallType meEventTypeOfCurrentUserCall;
 
         friend class NestedUserCallHdl;
-        // <--
 
         // unary function used by <list> iterator to find a disconnected 'virtual'
         // drawing object
@@ -456,41 +409,32 @@ class SwDrawContact : public SwContact
             bool operator() ( const SwDrawVirtObj* _pDrawVirtObj );
         };
 
-        // OD 16.05.2003 #108784# - method for adding/removing 'virtual' drawing object.
+        // method for adding/removing 'virtual' drawing object.
         SwDrawVirtObj* CreateVirtObj();
         void DestroyVirtObj( SwDrawVirtObj* pVirtObj );
         void RemoveAllVirtObjs();
 
-        // OD 2004-03-31 #i26791#
         void _InvalidateObjs( const bool _bUpdateSortedObjsList = false );
 
-        // --> OD 2006-01-23 #124157#
         // no copy-constructor and no assignment operator
         SwDrawContact( const SwDrawContact& );
         SwDrawContact& operator=( const SwDrawContact& );
-        // <--
     public:
         TYPEINFO();
 
         SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj );
         virtual ~SwDrawContact();
 
-        // OD 2004-03-29 #i26791#
-        // --> OD 2005-01-06 #i30669# - no default value for parameter <_pSdrObj>
         virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const;
         virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj );
-        // <--
 
-        // OD 2004-04-01 #i26791#
         virtual const SdrObject* GetMaster() const;
         virtual SdrObject* GetMaster();
         virtual void SetMaster( SdrObject* _pNewMaster );
 
-        // OD 2004-03-29 #i26791#
         const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = 0L ) const;
         SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = 0L );
 
-        // --> OD 2004-06-30 #i28701# - page frame is now stored at member <maAnchoredDrawObj>
         inline const SwPageFrm* GetPageFrm() const
         {
             return maAnchoredDrawObj.GetPageFrm();
@@ -503,7 +447,6 @@ class SwDrawContact : public SwContact
         {
             return maAnchoredDrawObj.SetPageFrm( _pNewPageFrm );
         }
-        // <--
         void ChkPage();
         SwPageFrm* FindPage( const SwRect &rRect );
 
@@ -511,15 +454,15 @@ class SwDrawContact : public SwContact
         //Der Anker wird Anhand des Attributes SwFmtAnchor bestimmt.
         //Das Objekt wird ggf. beim alten Anker abgemeldet.
         void ConnectToLayout( const SwFmtAnchor *pAnch = 0 );
-        // OD 27.06.2003 #108784# - method to insert 'master' drawing object
+        // method to insert 'master' drawing object
         // into drawing page
         void InsertMasterIntoDrawPage();
 
         void DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer = true );
-        // OD 19.06.2003 #108784# - disconnect for a dedicated drawing object -
+        // disconnect for a dedicated drawing object -
         // could be 'master' or 'virtual'.
         void DisconnectObjFromLayout( SdrObject* _pDrawObj );
-        // OD 26.06.2003 #108784# - method to remove 'master' drawing object
+        // method to remove 'master' drawing object
         // from drawing page.
         // To be used by the undo for delete of object. Call it after method
         // <DisconnectFromLayout( bool = true )> is already performed.
@@ -527,7 +470,7 @@ class SwDrawContact : public SwContact
         // drawing object from drawing page.
         void RemoveMasterFromDrawPage();
 
-        // OD 19.06.2003 #108784# - get drawing object ('master' or 'virtual')
+        // get drawing object ('master' or 'virtual')
         // by frame.
         SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm );
 
@@ -544,17 +487,12 @@ class SwDrawContact : public SwContact
         //Moved alle SW-Verbindungen zu dem neuen Master.
         void ChangeMasterObject( SdrObject *pNewMaster );
 
-        // OD 19.06.2003 #108784#
         SwDrawVirtObj* AddVirtObj();
 
-        // OD 20.06.2003 #108784#
         void NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect );
 
         /** get data collection of anchored objects, handled by with contact
 
-            OD 2004-08-23 #110810#
-
-            @author
         */
         virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const;
 };
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9a78865..8642dbc 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,15 +47,13 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentTimerAccess.hxx>
 #include <IDocumentChartDataProviderAccess.hxx>
-// --> OD 2007-10-26 #i83479#
 #include <IDocumentOutlineNodes.hxx>
 #include <IDocumentListItems.hxx>
 #include <set>
-// <--
-// --> OD 2008-03-12 #refactorlists#
+
 #include <IDocumentListsAccess.hxx>
 class SwList;
-// <--
+
 #include <IDocumentExternalData.hxx>
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
@@ -274,13 +272,9 @@ class SW_DLLPUBLIC SwDoc :
     public IDocumentLayoutAccess,
     public IDocumentTimerAccess,
     public IDocumentChartDataProviderAccess,
-    // --> OD 2007-10-26 #i83479#
     public IDocumentListItems,
     public IDocumentOutlineNodes,
-    // <--
-    // --> OD 2008-03-12 #refactorlists#
     public IDocumentListsAccess,
-    // <--
     public IDocumentExternalData
 {
 
@@ -375,13 +369,11 @@ class SW_DLLPUBLIC SwDoc :
     // Hash map to find numrules by name
     mutable std::hash_map<String, SwNumRule *, StringHash> maNumRuleMap;
 
-    // --> OD 2008-03-12 #refactorlists#
     typedef std::hash_map< String, SwList*, StringHash > tHashMapForLists;
     // container to hold the lists of the text document
     tHashMapForLists maLists;
     // relation between list style and its default list
     tHashMapForLists maListStyleLists;
-    // <--
 
     SwRedlineTbl	*pRedlineTbl;			// Liste aller Redlines
     String			*pAutoFmtRedlnComment;	// Kommentar fuer Redlines, die
@@ -410,7 +402,6 @@ class SW_DLLPUBLIC SwDoc :
     rtl::Reference<SvxForbiddenCharactersTable>	xForbiddenCharsTable;
     com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
     com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
-    // --> OD 2007-10-26 #i83479#
 public:
     struct lessThanNodeNum
     {
@@ -421,7 +412,6 @@ public:
     typedef ::std::set< const SwNodeNum*, lessThanNodeNum > tImplSortedNodeNumList;
 private:
     tImplSortedNodeNumList* mpListItemsList;
-    // <--
 
     ::std::auto_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry;
 
@@ -504,14 +494,12 @@ private:
     bool mbXMLExport : 1;                // TRUE: during XML export
 #endif
 
-    // --> OD 2006-03-21 #b6375613#
     // Document flag to trigger conversion, which applys the workaround for documents,
     // which uses a certain layout defect in OOo 1.x to layout the documents.
     // This conversion is performed, when the frames for the layout are created.
     // Thus, this document flag has to be set after load a document and before
     // creating the document view.
     bool mbApplyWorkaroundForB6375613 : 1;
-    // <--
 
     //
     // COMPATIBILITY FLAGS START
@@ -606,7 +594,6 @@ private:
     bool mbCollapseEmptyCellPara                    : 1;
     bool mbTabAtLeftIndentForParagraphsInList;             // OD 2008-06-05 #i89181# - see above
 
-    // #i78591#
     sal_uInt32  n32DummyCompatabilityOptions1;
     sal_uInt32  n32DummyCompatabilityOptions2;
     //
@@ -618,7 +605,7 @@ private:
     static SwAutoCompleteWord *pACmpltWords;	// Liste aller Worte fuers AutoComplete
     static sal_uInt16 nUndoActions; 	// anzahl von Undo ::com::sun::star::chaos::Action
 
-    //---------------- private Methoden ------------------------------
+    //---------------- privat Methods ------------------------------
     void checkRedlining(RedlineMode_t& _rReadlineMode);
 
     sal_Bool DelUndoObj( sal_uInt16 nEnde  );   // loescht alle UndoObjecte vom Anfang
@@ -649,9 +636,7 @@ private:
                             const bool bCopyFlyAtFly = false ) const;
     sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
 
-    // --> OD 2005-01-13 #i40550#
     typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, BOOL, BOOL );
-    // <--
     SwFmt* CopyFmt( const SwFmt& rFmt, const SvPtrarr& rFmtArr,
                         FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
     void CopyFmtArr( const SvPtrarr& rSourceArr, SvPtrarr& rDestArr,
@@ -700,7 +685,6 @@ private:
                         const SwTxtFmtColl* pSplitColl );
     sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaijianwei.
 
-
     // Charts der angegebenen Tabelle updaten
     void _UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const;
 
@@ -839,7 +823,6 @@ public:
     virtual void setUndoNoModifiedPosition( SwUndoNoModifiedPosition );
     virtual SwUndoNoModifiedPosition getUndoNoModifiedPosition() const;
 
-
     /** abfragen/setzen der Anzahl von wiederherstellbaren Undo-Actions */
     static sal_uInt16 GetUndoActionCount();
     static void SetUndoActionCount(sal_uInt16 nNew);
@@ -905,12 +888,11 @@ public:
     virtual void DeleteSection(SwNode* pNode);
     virtual bool DeleteRange(SwPaM&);
     virtual bool DelFullPara(SwPaM&);
-    // --> OD 2009-08-20 #i100466#
     // Add optional parameter <bForceJoinNext>, default value <false>
     // Needed for hiding of deletion redlines
     virtual bool DeleteAndJoin( SwPaM&,
                                 const bool bForceJoinNext = false );
-    // <--
+
     virtual bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags);
     virtual bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags);
     virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags);
@@ -1020,8 +1002,6 @@ public:
     virtual SwChartLockController_Helper & GetChartControllerHelper();
 
     /** IDocumentListItems
-
-        OD 2007-10-26 #i83479#
     */
     virtual void addListItem( const SwNodeNum& rNodeNum );
     virtual void removeListItem( const SwNodeNum& rNodeNum );
@@ -1032,8 +1012,6 @@ public:
     virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const;
 
     /** IDocumentOutlineNodes
-
-        OD 2007-11-15 #i83479#
     */
     virtual sal_Int32 getOutlineNodesCount() const;
     virtual int getOutlineLevel( const sal_Int32 nIdx ) const;
@@ -1044,8 +1022,6 @@ public:
     virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const;
 
     /** IDocumentListsAccess
-
-        OD 2008-03-26 #refactorlists#
     */
     virtual SwList* createList( String sListId,
                                 const String sDefaultListStyleName );
@@ -1054,17 +1030,14 @@ public:
     virtual SwList* createListForListStyle( const String sListStyleName );
     virtual SwList* getListForListStyle( const String sListStyleName ) const;
     virtual void deleteListForListStyle( const String sListStyleName );
-    // --> OD 2008-07-08 #i91400#
     virtual void trackChangeOfListStyleName( const String sListStyleName,
                                              const String sNewListStyleName );
-    // <--
 
     /** IDocumentExternalData */
-    virtual void setExternalData(::sw::tExternalDataType eType, 
+    virtual void setExternalData(::sw::tExternalDataType eType,
                                  ::sw::tExternalDataPointer pPayload);
     virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType);
 
-
     /** INextInterface here
     */
 
@@ -1127,16 +1100,14 @@ public:
 
     sal_Bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
                         SfxItemSet* pSet = 0, sal_Bool bKeepOrient = sal_False );
-    // --> OD 2009-07-20 #i73249#
     void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
                          const String& sNewTitle );
     void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
                                const String& sNewDescription );
-    // <--
 
     /** Footnotes
     */
-    // Fussnoten Informationen
+    // Footnote information
     const SwFtnInfo& GetFtnInfo() const			{ return *pFtnInfo; }
     void SetFtnInfo(const SwFtnInfo& rInfo);
     const SwEndNoteInfo& GetEndNoteInfo() const { return *pEndNoteInfo; }
@@ -1164,7 +1135,6 @@ public:
     // count words in pam
     void CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const;
 
-
     /** ???
     */
     // Textbaustein Dokument?
@@ -1218,14 +1188,12 @@ public:
 
         //Zuruecksetzen der Attribute; es werden alle TxtHints und bei
         //vollstaendiger Selektion harte Formatierung (AUTO-Formate) entfernt
-    // --> OD 2008-11-28 #i96644#
     // introduce new optional parameter <bSendDataChangedEvents> in order to
     // control, if the side effect "send data changed events" is triggered or not.
     void ResetAttrs( const SwPaM &rRg,
                      sal_Bool bTxtAttr = sal_True,
                      const SvUShortsSort* = 0,
                      const bool bSendDataChangedEvents = true );
-    // <--
     void RstTxtAttrs(const SwPaM &rRg, BOOL bInclRefToxMark = FALSE );
 
         // Setze das Attribut im angegebenen Format. Ist Undo aktiv, wird
@@ -1233,11 +1201,9 @@ public:
     void SetAttr( const SfxPoolItem&, SwFmt& );
     void SetAttr( const SfxItemSet&, SwFmt& );
 
-    // --> OD 2008-02-12 #newlistlevelattrs#
     // method to reset a certain attribute at the given format
     void ResetAttrAtFormat( const USHORT nWhichId,
                             SwFmt& rChangedFormat );
-    // <--
 
         // Setze das Attribut als neues default Attribut in diesem Dokument.
         // Ist Undo aktiv, wird das alte in die Undo-History aufgenommen
@@ -1279,11 +1245,9 @@ public:
     SwFrmFmt* FindFrmFmtByName( const String& rName ) const
         {	return (SwFrmFmt*)FindFmtByName( (SvPtrarr&)*pFrmFmtTbl, rName ); }
 
-    // --> OD 2005-01-13 #i40550#
     SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
                            BOOL bBroadcast = FALSE,
                            BOOL bAuto = TRUE );
-    // <--
     void	   DelCharFmt(sal_uInt16 nFmt, BOOL bBroadcast = FALSE);
     void	   DelCharFmt(SwCharFmt* pFmt, BOOL bBroadcast = FALSE);
     SwCharFmt* FindCharFmtByName( const String& rName ) const
@@ -1293,18 +1257,15 @@ public:
     // TXT
     const SwTxtFmtColl* GetDfltTxtFmtColl() const { return pDfltTxtFmtColl; }
     const SwTxtFmtColls *GetTxtFmtColls() const { return pTxtFmtCollTbl; }
-    // --> OD 2005-01-13 #i40550#
     SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName,
                                   SwTxtFmtColl *pDerivedFrom,
                                   BOOL bBroadcast = FALSE,
                                   BOOL bAuto = TRUE );
-    // <--
     SwConditionTxtFmtColl* MakeCondTxtFmtColl( const String &rFmtName,
                                                SwTxtFmtColl *pDerivedFrom,
                                                BOOL bBroadcast = FALSE);
     void DelTxtFmtColl(sal_uInt16 nFmt, BOOL bBroadcast = FALSE);
     void DelTxtFmtColl( SwTxtFmtColl* pColl, BOOL bBroadcast = FALSE );
-    // --> OD 2007-11-06 #i62675#
     // Add 4th optional parameter <bResetListAttrs>.
     // 'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard
     // attributes of the affected text nodes are cleared, except the break
@@ -1315,7 +1276,6 @@ public:
     sal_Bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt,
                             bool bReset = true,
                             bool bResetListAttrs = false );
-    // <--
     SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const
         {	return (SwTxtFmtColl*)FindFmtByName( (SvPtrarr&)*pTxtFmtCollTbl, rName ); }
 
@@ -1343,7 +1303,6 @@ public:
     sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL) const;
     SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL);
 
-
     // kopiere die Formate in die eigenen Arrays und returne diese
     SwFrmFmt  *CopyFrmFmt ( const SwFrmFmt& );
     SwCharFmt *CopyCharFmt( const SwCharFmt& );
@@ -1374,11 +1333,11 @@ public:
 
     // get the set of printable pages for the XRenderable API by
     // evaluating the respective settings (see implementation)
-    void CalculatePagesForPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, 
+    void CalculatePagesForPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
             sal_Int32 nDocPageCount );
-    void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport, 
+    void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
             sal_Int32 nDocPageCount );
-    void CalculatePagePairsForProspectPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions, 
+    void CalculatePagePairsForProspectPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions,
             sal_Int32 nDocPageCount );
 
     sal_uInt16 GetPageCount() const;
@@ -1411,25 +1370,19 @@ public:
     void ChgPageDesc( const String & rName, const SwPageDesc& );
     void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
     BOOL FindPageDesc( const String & rName, sal_uInt16 * pFound );
-    // -> #116530#
     void DelPageDesc( const String & rName, BOOL bBroadcast = FALSE);
     void DelPageDesc( sal_uInt16 i, BOOL bBroadcast = FALSE );
-    // <- #116530#
-    void PreDelPageDesc(SwPageDesc * pDel); // #i7983#
-    // -> #116530#
+    void PreDelPageDesc(SwPageDesc * pDel);
     sal_uInt16 MakePageDesc( const String &rName, const SwPageDesc* pCpy = 0,
                              BOOL bRegardLanguage = TRUE,
                              BOOL bBroadcast = FALSE);
     void BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
                                  USHORT nOp);
-    // <- #116530#
-
 
-    // --> FME 2005-03-16 #i44963# The html import sometimes overwrites the
+    // The html import sometimes overwrites the
     // page sizes set in the page descriptions. This function is used to
     // correct this.
     void CheckDefaultPageFmt();
-    // <--
 
         // Methoden fuer die Verzeichnisse:
         // - Verzeichnismarke einfuegen loeschen travel
@@ -1496,7 +1449,7 @@ public:
 
         // korrigiere die im Dokument angemeldeten SwPosition-Objecte,
         // wie z.B. die ::com::sun::star::text::Bookmarks oder die Verzeichnisse.
-        // JP 22.06.95: ist bMoveCrsr gesetzt, verschiebe auch die Crsr
+        // ist bMoveCrsr gesetzt, verschiebe auch die Crsr
 
         // Setzt alles in rOldNode auf rNewPos + Offset
     void CorrAbs( const SwNodeIndex& rOldNode, const SwPosition& rNewPos,
@@ -1512,12 +1465,10 @@ public:
                     const xub_StrLen nOffset = 0, sal_Bool bMoveCrsr = sal_False );
 
         // GliederungsRegeln erfragen / setzen
-    // --> OD 2005-11-02 #i51089 - TUNING#
     inline SwNumRule* GetOutlineNumRule() const
     {
         return pOutlineRule;
     }
-    // <--
     void SetOutlineNumRule( const SwNumRule& rRule );
     void PropagateOutlineRule();
 
@@ -1531,13 +1482,11 @@ public:
 
         // setzt, wenn noch keine Numerierung, sonst wird geaendert
         // arbeitet mit alten und neuen Regeln, nur Differenzen aktualisieren
-    // --> OD 2005-02-18 #i42921# - re-use unused 3rd parameter
-    // --> OD 2008-02-08 #newlistlevelattrs#
+    // re-use unused 3rd parameter
     // Add optional parameter <bResetIndentAttrs> - default value FALSE.
     // If <bResetIndentAttrs> equals true, the indent attributes "before text"
     // and "first line indent" are additionally reset at the provided PaM, if
     // the list style makes use of the new list level attributes.
-    // --> OD 2008-03-17 #refactorlists#
     // introduce parameters <bCreateNewList> and <sContinuedListId>
     // <bCreateNewList> indicates, if a new list is created by applying the
     // given list style.
@@ -1547,10 +1496,8 @@ public:
                      const String sContinuedListId = String(),
                      sal_Bool bSetItem = sal_True,
                      const bool bResetIndentAttrs = false );
-    // <--
     void SetCounted( const SwPaM&, bool bCounted);
 
-    // --> OD 2009-08-25 #i86492#
     // no longer needed.
     // SwDoc::SetNumRule( rPaM, rNumRule, false, <ListId>, sal_True, true ) have to be used instead.
 //    /**
@@ -1570,7 +1517,6 @@ public:
 
     const SwNumRuleTbl& GetNumRuleTbl() const { return *pNumRuleTbl; }
 
-    // #i36749#
     /**
        Add numbering rule to document.
 
@@ -1578,26 +1524,22 @@ public:
     */
     void AddNumRule(SwNumRule * pRule);
 
-    // --> OD 2008-02-11 #newlistlevelattrs#
     // add optional parameter <eDefaultNumberFormatPositionAndSpaceMode>
     sal_uInt16 MakeNumRule( const String &rName,
         const SwNumRule* pCpy = 0,
         BOOL bBroadcast = FALSE,
         const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode =
             SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
-    // <--
     sal_uInt16 FindNumRule( const String& rName ) const;
     SwNumRule* FindNumRulePtr( const String& rName ) const;
 
     // loeschen geht nur, wenn die ::com::sun::star::chaos::Rule niemand benutzt!
-    // #106897#
     sal_Bool RenameNumRule(const String & aOldName, const String & aNewName,
                            BOOL bBroadcast = FALSE);
     sal_Bool DelNumRule( const String& rName, BOOL bBroadCast = FALSE );
     String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
 
     void UpdateNumRule();	// alle invaliden Updaten
-    // #106897#
     void ChgNumRuleFmts( const SwNumRule& rRule, const String * pOldName = 0 );
     sal_Bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule,
                         const String& rNewRule );
@@ -1608,11 +1550,10 @@ public:
     sal_Bool GotoPrevNum( SwPosition&, sal_Bool bOverUpper = sal_True,
                         sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 );
 
-    // #i23731#
     /** Searches for a text node with a numbering rule.
 
-       OD 2005-10-24 #i55391# - add optional parameter <bInvestigateStartNode>
-       OD 2008-03-18 #refactorlists# - add output parameter <sListId>
+       add optional parameter <bInvestigateStartNode>
+       add output parameter <sListId>
 
        \param rPos         position to start search
        \param bForward     - TRUE:  search forward
@@ -1660,11 +1601,10 @@ public:
 
         // fuege eine neue Tabelle auf der Position rPos ein. (es
         // wird vor dem Node eingefuegt !!)
-        //JP 28.10.96:
         // 	fuer AutoFormat bei der Eingabe: dann muessen die Spalten
         //	auf die vordefinierten Breite gesetzt werden. Im Array stehen die
         // 	Positionen der Spalten!! (nicht deren Breite!)
-    /* #109161# new parameter bCalledFromShell:
+    /* new parameter bCalledFromShell:
 
        TRUE: called from shell -> propagate existing adjust item at
        rPos to every new cell. A existing adjust item in the table
@@ -1727,7 +1667,6 @@ public:
     void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const SwCursor* pCrsr,
                      const SwCellFrm* pBoxFrm = 0 );
 
-
     // Direktzugriff fuer Uno
     void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld,
                                     const SwTableBox *pStart, sal_Bool bCurRowOnly);
@@ -1870,7 +1809,6 @@ public:
     void SpellItAgainSam( sal_Bool bInvalid, sal_Bool bOnlyWrong, sal_Bool bSmartTags );
     void InvalidateAutoCompleteFlag();
 
-    // <--
     void SetCalcFieldValueHdl(Outliner* pOutliner);
 
     // erfrage ob die ::com::sun::star::util::URL besucht war. Uebers Doc, falls nur ein ::com::sun::star::text::Bookmark
@@ -1947,7 +1885,7 @@ public:
     void SetPreViewPrtData( const SwPagePreViewPrtData* pData );
 
     // update all modified OLE-Objects. The modification is called over the
-    // StarOne - Interface				--> Bug 67026
+    // StarOne - Interface
     void SetOLEObjModified()
     {	if( GetRootFrm() ) aOLEModifiedTimer.Start(); }
 
@@ -1992,7 +1930,6 @@ public:
     //
     // -------------------- FeShell - Schnittstellen Ende ------------------
 
-
     // Schnittstelle fuer die TextInputDaten - ( fuer die Texteingabe
     // von japanischen/chinesischen Zeichen)
     SwExtTextInput* CreateExtTextInput( const SwPaM& rPam );
@@ -2028,10 +1965,8 @@ public:
 
     IGrammarContact* getGrammarContact() const { return mpGrammarContact; }
 
-    // -> #i27615#
     /** Marks/Unmarks a list level of a certain list
 
-        OD 2008-04-02 #refactorlists#
         levels of a certain lists are marked now
 
         @param sListId    list Id of the list whose level has to be marked/unmarked
@@ -2045,7 +1980,6 @@ public:
 
     /** Marks/Unmarks a list level of a certain list
 
-        OD 2008-04-02 #refactorlists#
         levels of a certain lists are marked now
 
         @param rList      list whose level has to be marked/unmarked
@@ -2056,7 +1990,6 @@ public:
     void MarkListLevel( SwList& rList,
                         const int nListLevel,
                         const BOOL bValue );
-    // <- #i27615#
 
     // Change a format undoable.
     void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
@@ -2067,7 +2000,6 @@ public:
     // Change a TOX undoable.
     void ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew);
 
-    // #111827#
     /**
        Returns a textual description of a PaM.
 
@@ -2087,11 +2019,9 @@ public:
      */
     String GetPaMDescr(const SwPaM & rPaM) const;
 
-    // -> #i23726#
     BOOL IsFirstOfNumRule(SwPosition & rPos);
-    // <- #i23726#
 
-    // --> #i31958# access methods for XForms model(s)
+    // access methods for XForms model(s)
 
     /// access container for XForms model; will be NULL if !isXForms()
     com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
@@ -2104,21 +2034,18 @@ public:
 
     /// initialize XForms models; turn this into an XForms document
     void initXForms( bool bCreateDefaultModel );
-    // <-- #i31958# access methods for XForms model(s)
+    // access methods for XForms model(s)
 
-    // --> OD 2006-03-21 #b6375613#
     inline bool ApplyWorkaroundForB6375613() const
     {
         return mbApplyWorkaroundForB6375613;
     }
     void SetApplyWorkaroundForB6375613( bool p_bApplyWorkaroundForB6375613 );
-    // <--
 
     //Update all the page masters
     void SetDefaultPageMode(bool bSquaredPageMode);
     sal_Bool IsSquaredPageMode() const;
 
-    // i#78591#
     void Setn32DummyCompatabilityOptions1( sal_uInt32 CompatabilityOptions1 )
     {
         n32DummyCompatabilityOptions1 = CompatabilityOptions1;
@@ -2143,14 +2070,10 @@ public:
     SfxObjectShell* CreateCopy(bool bCallInitNew) const;
 };
 
-
 // Diese Methode wird im Dtor vom SwDoc gerufen und loescht den Cache
 // der Konturobjekte
 void ClrContourCache();
 
-
-//------------------ inline impl. ---------------------------------
-
 inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const
 {
     return ((SwDoc*)this)->IsIdxInTbl( rIdx );
@@ -2175,14 +2098,11 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
         mbAllOLENotify = sal_False;
 }
 
-// --> OD 2006-03-14 #i62875#
 // namespace <docfunc> for functions and procedures working on a Writer document.
 namespace docfunc
 {
     /** method to check, if given Writer document contains at least one drawing object
 
-        OD 2006-03-17 #i62875#
-
         @author OD
 
         @param p_rDoc
@@ -2193,8 +2113,6 @@ namespace docfunc
     /** method to check, if given Writer document contains only drawing objects,
         which are completely on its page.
 
-        OD 2006-03-17 #i62875#
-
         @author OD
 
         @param p_rDoc
@@ -2221,7 +2139,6 @@ namespace docfunc
     */
     bool HasOutlineStyleToBeWrittenAsNormalListStyle( SwDoc& rDoc );
 }
-// <--
 #endif	//_DOC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 713a30b..922e316 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,15 +45,10 @@
 #include <vector>
 #include <set>
 
-
 class SwNumRule;
 class SwNodeNum;
-// --> OD 2008-05-06 #refactorlists#
 class SwList;
-// <--
-// --> OD 2008-12-02 #i96772#
 class SvxLRSpaceItem;
-// <--
 
 namespace utl {
     class TransliterationWrapper;
@@ -65,7 +60,6 @@ class SwTxtFld; 		 // Fuer GetTxtFld()
 class SfxItemSet;
 class SwUndoTransliterate;
 
-
 struct SwSpellArgs;             // for Spell(), splargs.hxx
 struct SwConversionArgs;        // for Convert(), splargs.hxx
 class SwInterHyphInfo;          // for Hyphenate(), splargs.hxx
@@ -101,9 +95,8 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     //Also niemals direkt zugreifen!
     SwpHints    *m_pSwpHints;
 
-    // --> OD 2005-11-02 #i51089 - TUNING#
     mutable SwNodeNum* mpNodeNum;  // Numerierung fuer diesen Absatz
-    // <--
+
     XubString   m_Text;
 
     SwParaIdleData_Impl* m_pParaIdleData_Impl;
@@ -120,21 +113,16 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     bool m_bNotifiable;
 
     // BYTE nOutlineLevel; //#outline level, removed by zhaojianwei.
-    // --> OD 2008-11-19 #i70748#
     bool mbEmptyListStyleSetDueToSetOutlineLevelAttr;
-    // <--
 
-    // --> OD 2008-03-27 #refactorlists#
     // boolean, indicating that a <SetAttr(..)> or <ResetAttr(..)> or
     // <ResetAllAttr(..)> method is running.
     // Needed to avoid duplicate handling of attribute change actions.
     bool mbInSetOrResetAttr;
-    // <--
-    // --> OD 2008-05-06 #refactorlists#
+
     // pointer to the list, to whose the text node is added to
     SwList* mpList;
-    // <--
-    /// #i111677# cached expansion (for clipboard)
+
     ::std::auto_ptr< ::rtl::OUString > m_pNumStringCache;
 
     ::com::sun::star::uno::WeakReference<
@@ -195,9 +183,6 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 
     /** create number for this text node, if not already existing
 
-        OD 2005-11-02 #i51089 - TUNING#
-        OD 2007-10-26 #i83479# - made private
-
         @return number of this node
     */
     SwNodeNum* CreateNum() const;
@@ -219,9 +204,7 @@ public:
     void SetAutoCompleteWordDirty( bool bNew ) const;
     void SetWrong( SwWrongList* pNew, bool bDelete = true );
     SwWrongList* GetWrong();
-    // --> OD 2008-05-23 #i71360#
     const SwWrongList* GetWrong() const;
-    // <--
     void SetGrammarCheck( SwGrammarMarkUp* pNew, bool bDelete = true );
     SwGrammarMarkUp* GetGrammarCheck();
     // SMARTTAGS
@@ -253,14 +236,12 @@ public:
     void GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, ULONG &rAbs,
                         OutputDevice* pOut = 0 ) const;
 
-    // --> OD 2008-03-13 #refactorlists#
     // overriding to handle change of certain paragraph attributes
     virtual BOOL SetAttr( const SfxPoolItem& );
     virtual BOOL SetAttr( const SfxItemSet& rSet );
     virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
     virtual BOOL ResetAttr( const SvUShorts& rWhichArr );
     virtual USHORT ResetAllAttr();
-    // <--
 
     /// insert text content
     void InsertText( const XubString & rStr, const SwIndex & rIdx,
@@ -293,7 +274,7 @@ public:
     // loesche das Text-Attribut (muss beim Pool abgemeldet werden!)
     void 	DestroyAttr( SwTxtAttr* pAttr );
 
-    // loesche alle Attribute aus dem SwpHintsArray.
+    // delete all attributes from SwpHintsArray.
     void    ClearSwpHintsArr( bool bDelFields );
 
     /// Insert pAttr into hints array. @return true iff inserted successfully
@@ -311,7 +292,6 @@ public:
                   xub_StrLen nStt, xub_StrLen nEnd,
                   const SetAttrMode nMode = nsSetAttrMode::SETATTR_DEFAULT );
     // erfrage die Attribute vom TextNode ueber den Bereich
-    // --> OD 2008-01-16 #newlistlevelattrs#
     // Introduce 4th optional parameter <bMergeIndentValuesOfNumRule>.
     // If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of
     // the corresponding list level of an applied list style is merged into
@@ -322,7 +302,6 @@ public:
                   BOOL bOnlyTxtAttr  = FALSE,
                   BOOL bGetFromChrFmt = TRUE,
                   const bool bMergeIndentValuesOfNumRule = false ) const;
-    // <--
 
     // uebertrage Attribute eines AttrSets ( AutoFmt ) in das SwpHintsArray
     void FmtToTxtAttr( SwTxtNode* pNd );
@@ -334,7 +313,6 @@ public:
     void DeleteAttribute ( SwTxtAttr * const pTxtAttr );
 
     // Aktionen auf Text und Attributen
-    // --> OD 2008-11-18 #i96213#
     // introduce optional parameter to control, if all attributes have to be copied.
     void CopyText( SwTxtNode * const pDest,
                const SwIndex &rStart,
@@ -345,7 +323,6 @@ public:
                const SwIndex &rStart,
                xub_StrLen nLen,
                const bool bForceCopyOfAllAttrs = false );
-    // <--
 
     void        CutText(SwTxtNode * const pDest,
                     const SwIndex & rStart, const xub_StrLen nLen);
@@ -454,9 +431,7 @@ public:
 
     void UpdateOutlineState();
 
-    /** -> #i23730#
-
-        Returns if this text node may be numbered.
+    /** Returns if this text node may be numbered.
 
         A text node may be numbered if
           - it has no SwNodeNum
@@ -475,7 +450,6 @@ public:
 
     /** Returns outline of numbering string
 
-        OD 2005-11-17 #128041#
         Introduce parameter <_bInclPrefixAndSuffixStrings> in order to control,
         if the prefix and the suffix strings have to been included or not.
 
@@ -511,17 +485,12 @@ public:
      */
     BOOL GetFirstLineOfsWithNum( short& rFirstOffset ) const;
 
-    // --> OD 2010-01-05 #b6884103#
     SwTwips GetAdditionalIndentForStartingNewList() const;
-    // <--
 
-    // --> OD 2008-12-02 #i96772#
     void ClearLRSpaceItemDueToListLevelIndents( SvxLRSpaceItem& o_rLRSpaceItem ) const;
-    // <--
 
     /** return left margin for tab stop position calculation
 
-        OD 2008-06-30 #i91133#
         Needed for text formatting
         Method considers new list level attributes, which also can provide a left margin value
 
@@ -529,8 +498,7 @@ public:
     */
     long GetLeftMarginForTabCalculation() const;
 
-    /** -> #i29560
-        Returns if this text node has a number.
+    /** Returns if this text node has a number.
 
         This text node has a number if it has a SwNodeNum and a
         numbering rule and the numbering format specified for the
@@ -541,8 +509,7 @@ public:
      */
     BOOL HasNumber() const;
 
-    /** -> #i29560
-        Returns if this text node has a bullet.
+    /** Returns if this text node has a bullet.
 
         This text node has a bullet if it has a SwNodeNum and a
         numbering rule and the numbering format specified for the
@@ -553,8 +520,7 @@ public:
      */
     BOOL HasBullet() const;
 
-    /** -> #i27615#
-        Returns is this text node is numbered.
+    /** Returns is this text node is numbered.
 
         This node is numbered if it has a SwNodeNum and it has a
         numbering rule and has not a hidden SwNodeNum.
@@ -567,8 +533,7 @@ public:
      */
     BOOL IsNumbered() const;
 
-    /** -> #i27615#
-        Returns if this text node has a marked label.
+    /** Returns if this text node has a marked label.
 
         @retval true       This text node has a marked label.
         @retval false      else
@@ -631,14 +596,11 @@ public:
 
        NOTE: This is subject to change, see GetOutlineLevel.
      */
-    //void SetOutlineLevel(int nLevel);
-      void SetAttrOutlineLevel(int nLevel);//#OutlineLevel,added by zhaojianwei
+    void SetAttrOutlineLevel(int nLevel);//#OutlineLevel,added by zhaojianwei
 
-    // --> OD 2008-11-19 #i70748#
     bool IsEmptyListStyleDueToSetOutlineLevelAttr();
     void SetEmptyListStyleDueToSetOutlineLevelAttr();
     void ResetEmptyListStyleDueToResetOutlineLevelAttr();
-    // <--
 
     /**
        Returns the width of leading tabs/blanks in this paragraph.
@@ -649,7 +611,6 @@ public:
      */
     USHORT GetWidthOfLeadingTabs() const;
 
-
     /**
        Returns if the paragraph has a visible numbering or bullet.
        This includes all kinds of numbering/bullet/outlines.
@@ -660,15 +621,12 @@ public:
      */
     bool HasVisibleNumberingOrBullet() const;
 
-    // --> OD 2008-02-19 #refactorlists#
     void SetListId( const String sListId );
     String GetListId() const;
-    // <--
 
     /** Determines, if the list level indent attributes can be applied to the
         paragraph.
 
-        OD 2008-01-17 #newlistlevelattrs#
         The list level indents can be applied to the paragraph under the one
         of following conditions:
         - the list style is directly applied to the paragraph and the paragraph
@@ -687,8 +645,6 @@ public:
     /** Retrieves the list tab stop position, if the paragraph's list level defines
         one and this list tab stop has to merged into the tap stops of the paragraph
 
-        OD 2008-01-17 #newlistlevelattrs#
-
         @author OD
 
         @param nListTabStopPosition
@@ -701,8 +657,6 @@ public:
     /** Retrieves the character following the list label, if the paragraph's
         list level defines one.
 
-        OD 2008-01-17 #newlistlevelattrs#
-
         @author OD
 
         @return XubString - the list tab stop position
@@ -718,7 +672,7 @@ public:
     USHORT GetLang( const xub_StrLen nBegin, const xub_StrLen nLen = 0,
                     USHORT nScript = 0 ) const;
 
-    // steht in ndcopy.cxx
+    // in ndcopy.cxx
     BOOL IsSymbol( const xub_StrLen nBegin ) const;	// steht in itratr.cxx
     virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
 
@@ -726,7 +680,6 @@ public:
     BOOL Hyphenate( SwInterHyphInfo &rHyphInf );
     void DelSoftHyph( const xub_StrLen nStart, const xub_StrLen nEnd );
 
-    // --> OD 2007-11-15 #i83479#
     // add 4th optional parameter <bAddSpaceAfterListLabelStr> indicating,
     // when <bWithNum = true> that a space is inserted after the string for
     // the list label.
@@ -738,15 +691,11 @@ public:
                             const bool bWithNum = false,
                             const bool bAddSpaceAfterListLabelStr = false,
                             const bool bWithSpacesForLevel = false ) const;
-    // <--
     BOOL GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0,
                         xub_StrLen nIdx = 0, xub_StrLen nLen = STRING_LEN,
                        BOOL bWithNum = FALSE, BOOL bWithFtn = TRUE,
                        BOOL bReplaceTabsWithSpaces = FALSE ) const;
 
-    /*
-     *
-     */
     const ModelToViewHelper::ConversionMap*
             BuildConversionMap( rtl::OUString& rExpandText ) const;
 
@@ -785,7 +734,6 @@ public:
     inline void SetCalcHiddenCharFlags() const
         { m_bRecalcHiddenCharFlags = true; }
 
-// --> FME 2004-06-08 #i12836# enhanced pdf
     //
     // Returns if the node is hidden due to
     // 1. HiddenParaField
@@ -793,7 +741,6 @@ public:
     // 3. HiddenSection
     //
     bool IsHidden() const;
-// <--
 
     TYPEINFO();	// fuer rtti
 
@@ -820,9 +767,7 @@ public:
     bool IsNotifiable() const;
 
     void SetListRestart( bool bRestart );
-    // --> OD 2005-11-02 #i51089 - TUNING#
     bool IsListRestart() const;
-    // <--
 
     void SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNum );
     bool HasAttrListRestartValue() const;
@@ -832,13 +777,9 @@ public:
     void SetCountedInList( bool bCounted );
     bool IsCountedInList() const;
 
-    // --> OD 2008-03-13 #refactorlists#
-//    void SyncNumberAndNumRule();
-//    void UnregisterNumber();
     void AddToList();
     void RemoveFromList();
     bool IsInList() const;
-    // <--
 
     bool IsFirstOfNumRule() const;
 
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index b2ff5e8..f0412ea 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -65,9 +65,6 @@ class SwChartDataProvider;
 class SwFrmFmt;
 
 
-/* -----------------------------22.09.00 11:10--------------------------------
-
- ---------------------------------------------------------------------------*/
 class SwChartEventListenerContainer : public SwEventListenerContainer
 {
     public:
@@ -75,9 +72,7 @@ class SwChartEventListenerContainer : public SwEventListenerContainer
             SwEventListenerContainer(pxParentL){}
         void ChartDataChanged();
 };
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 typedef
 cppu::WeakImplHelper4
 <
@@ -179,9 +174,7 @@ public:
 
     SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
 };
-/* -----------------27.06.98 15:40-------------------
- *
- * --------------------------------------------------*/
+
 class SwXTextTableRow : public cppu::WeakImplHelper2
 <
     ::com::sun::star::beans::XPropertySet,
@@ -221,9 +214,7 @@ public:
     const SwTableLine* 	GetTblRow() const {return pLine;}
     static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
 };
-/* -----------------20.07.98 13:03-------------------
- *
- * --------------------------------------------------*/
+
 typedef cppu::WeakImplHelper3<
                                 ::com::sun::star::text::XTextTableCursor,
                                 ::com::sun::star::lang::XServiceInfo,
@@ -236,8 +227,6 @@ class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base
     SwDepend 				aCrsrDepend;
     const SfxItemPropertySet*   m_pPropSet;
 
-    //	SwUnoCrsr* 		GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
-
 protected:
     virtual ~SwXTextTableCursor();
 public:
@@ -288,9 +277,6 @@ public:
     SwFrmFmt* 		GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
 };
 
-/*-----------------11.12.97 09:38-------------------
-
---------------------------------------------------*/
 struct SwRangeDescriptor
 {
     sal_Int32 nTop;
@@ -424,9 +410,6 @@ public:
     SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
 };
 
-/* -----------------27.04.98 16:41-------------------
- *
- * --------------------------------------------------*/
 class SwXCellRange : public cppu::WeakImplHelper7
 <
     ::com::sun::star::table::XCellRange,
@@ -520,9 +503,7 @@ public:
             sal_Bool bForceNumberResults = sal_False ) throw (::com::sun::star::uno::RuntimeException);
     
 };
-/* -----------------03.02.99 07:31-------------------
- *
- * --------------------------------------------------*/
+
 class SwXTableRows : public cppu::WeakImplHelper2
 <
     ::com::sun::star::table::XTableRows,
@@ -540,14 +521,6 @@ public:
 
     TYPEINFO();
 
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//	virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >  > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//	virtual sal_Bool		queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  & rOut );
-
-//	SMART_UNO_DECLARATION( SwXTableRows, UsrObject );
-
     //XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
@@ -569,9 +542,6 @@ public:
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
 };
 
-/* -----------------03.02.99 07:31-------------------
- *
- * --------------------------------------------------*/
 class SwXTableColumns : public cppu::WeakImplHelper2
 <
     ::com::sun::star::table::XTableColumns,
@@ -588,13 +558,6 @@ public:
     
 
     TYPEINFO();
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//	virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >  > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//	virtual sal_Bool		queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  & rOut );
-
-//	SMART_UNO_DECLARATION( SwXTableColumns, UsrObject );
 
     //XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 1f35b86..f4fca2c 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -55,10 +55,8 @@ class IDocumentContentOperations;
 class IDocumentStylePoolAccess;
 class IDocumentStatistics;
 class IDocumentUndoRedo;
-// --> OD 2007-11-14 #i83479#
 class IDocumentListItems;
 class IDocumentOutlineNodes;
-// <--
 class SfxPrinter;
 class SfxProgress;
 class SwRootFrm;
@@ -94,7 +92,6 @@ namespace vcl
 }
 
 
-//JP 19.07.98: - Bug 52312
 // define fuer Flags, die im CTOR oder den darunter liegenden Schichten
 // benoetigt werden.
 // Zur Zeit wird fuer die DrawPage das PreView Flag benoetigt
@@ -110,17 +107,15 @@ class SW_DLLPUBLIC ViewShell : public Ring
     friend class SwViewImp;
     friend class SwLayIdle;
 
-    // OD 12.12.2002 #103492# - for setting visible area for page preview paint
+    // for setting visible area for page preview paint
     friend class SwPagePreviewLayout;
 
     //Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert
     //werden kann.
     friend void SetSwVisArea( ViewShell *pSh, const SwRect &, BOOL bPDFExport = FALSE );
 
-    // --> PB 2007-05-30 #146850#
     static BitmapEx*    pReplaceBmp;    // replaced display of still loaded images
     static BitmapEx*    pErrorBmp;      // error display of missed images
-    // <--
 
     static sal_Bool bLstAct;			// sal_True wenn Das EndAction der letzten Shell
                                     // laeuft; also die EndActions der
@@ -164,10 +159,9 @@ class SW_DLLPUBLIC ViewShell : public Ring
 
                                 //Device (etwa beim Browsen)
 
-    // OD 2004-06-01 #i26791# - boolean, indicating that class in in constructor
+    // boolean, indicating that class in in constructor
     bool mbInConstructor:1;
 
-    // #i74769#
     SdrPaintWindow*			mpTargetPaintWindow;
     OutputDevice*			mpBufferedOut;
 
@@ -338,7 +332,6 @@ public:
      */
     IDocumentUndoRedo* getIDocumentUndoRedoAccess();
 
-    // --> OD 2007-11-14 #i83479#
     const IDocumentListItems* getIDocumentListItemsAccess() const;
     const IDocumentOutlineNodes* getIDocumentOutlineNodesAccess() const;
     // <--
@@ -402,26 +395,22 @@ public:
     // formatting by virtual device or printer
     void SetUseVirDev( bool nNew );
 
-    // OD 2004-02-16 #106629# - adding paragraph and table spacing at bottom
+    // adding paragraph and table spacing at bottom
     // of table cells
     void SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCells );
 
-    // OD 06.01.2004 #i11859# - former formatting of text lines with
+    // former formatting of text lines with
     // proportional line spacing or not
     void SetUseFormerLineSpacing( bool _bUseFormerLineSpacing );
 
-    // OD 2004-03-12 #i11860# - former object positioning
+    // former object positioning
     void SetUseFormerObjectPositioning( bool _bUseFormerObjPos );
 
-    // OD 2004-05-05 #i28701#
     void SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos );
 
-    // --> FME #108724#
     void SetUseFormerTextWrapping( bool _bUseFormerTextWrapping );
 
-    // -> PB 2007-06-11 #i45491#
     void SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesWithManualBreak );
-    // <--
 
     //
     // DOCUMENT COMPATIBILITY FLAGS END
@@ -454,12 +443,10 @@ public:
     // Selektion der Draw ::com::sun::star::script::Engine geaendert
     virtual void DrawSelChanged();
 
-    // OD 12.12.2002 #103492#
     SwPagePreviewLayout* PagePreviewLayout();
 
     /** adjust view options for page preview
 
-        OD 09.01.2003 #i6467#
         Because page preview should show the document as it is printed -
         page preview is print preview -, the view options are adjusted to the
         same as for printing.
@@ -512,8 +499,6 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
-    // OD 15.01.2003 #103492# - change method signature due to new page preview
-    // functionality.
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible >
             CreateAccessiblePreview();
@@ -526,8 +511,6 @@ public:
 
     /** invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
 
-        OD 2005-12-01 #i27138#
-
         @author OD
 
         @param _pFromTxtFrm
@@ -545,16 +528,13 @@ public:
 
     /** invalidate text selection for paragraphs
 
-        OD 2005-12-12 #i27301#
-
         @author OD
     */
     void InvalidateAccessibleParaTextSelection();
 
     /** invalidate attributes for paragraphs and paragraph's characters
 
-        OD 2009-01-06 #i88069#
-        OD 2010-02-16 #i104008# - usage also for changes of the attributes of
+        usage also for changes of the attributes of
         paragraph's characters.
 
         @author OD
@@ -573,16 +553,12 @@ public:
                long nFlags = 0 );
     virtual ~ViewShell();
 
-    // --> FME 2004-06-15 #i12836# enhanced pdf export
     sal_Int32 GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const;
-    // <--
 
     inline bool IsInConstructor() const { return mbInConstructor; }
 
-    // --> PB 2007-05-30 #146850#
     static const BitmapEx& GetReplacementBitmap( bool bIsErrorState );
     static void DeleteReplacementBitmaps();
-    // <--
 
     const SwPostItMgr* GetPostItMgr() const { return (const_cast<ViewShell*>(this))->GetPostItMgr(); }
     SwPostItMgr* GetPostItMgr();
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index fd9df1f..0927cf5 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -79,7 +79,6 @@ public:
 
 // ------ Ab hier Klassen / Methoden fuer die Selectionen -------
 
-// #i75172# predefines
 namespace sdr { namespace overlay { class OverlayObject; }}
 
 class SwSelPaintRects : public SwRects
@@ -90,16 +89,14 @@ class SwSelPaintRects : public SwRects
     static long nPixPtX, nPixPtY;
     static MapMode *pMapMode;
 
-    // die Shell
     const SwCrsrShell* pCShell;
 
     virtual void Paint( const Rectangle& rRect );
     virtual void FillRects() = 0;
 
-    // #i75172#
     sdr::overlay::OverlayObject*	mpCursorOverlay;
 
-    // #i75172# access to mpCursorOverlay for swapContent
+    // access to mpCursorOverlay for swapContent
     sdr::overlay::OverlayObject* getCursorOverlay() const { return mpCursorOverlay; }
     void setCursorOverlay(sdr::overlay::OverlayObject* pNew) { mpCursorOverlay = pNew; }
 
@@ -107,7 +104,7 @@ public:
     SwSelPaintRects( const SwCrsrShell& rCSh );
     virtual ~SwSelPaintRects();
 
-    // #i75172# in SwCrsrShell::CreateCrsr() the content of SwSelPaintRects is exchanged. To
+    // in SwCrsrShell::CreateCrsr() the content of SwSelPaintRects is exchanged. To
     // make a complete swap access to mpCursorOverlay is needed there
     void swapContent(SwSelPaintRects& rSwap);
 
@@ -166,7 +163,7 @@ public:
     virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
 
 #ifdef DBG_UTIL
-// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
+// zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //				am sichtbaren Cursor
     virtual BOOL IsSelOvr( int eFlags =
                                 ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
@@ -210,7 +207,7 @@ public:
     virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
 
 #ifdef DBG_UTIL
-// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
+// zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //				am sichtbaren Cursor
     virtual BOOL IsSelOvr( int eFlags =
                                 ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 93fb75b..021e429 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -101,34 +101,10 @@
 
 using namespace sw::sidebarwindows;
 
-/*
-bool comp_author( const SwPostItItem* a, const SwPostItItem* b)
-{
-    return a->pFmtFld->GetFld()->GetPar1() < b->pFmtFld->GetFld()->GetPar1();
-}
-
-bool comp_date( const SwPostItItem* a, const SwPostItItem* b)
-{
-    return static_cast<SwPostItField*>(a->pFmtFld->GetFld())->GetDate()  < static_cast<SwPostItField*>(b->pFmtFld->GetFld())->GetDate();
-}
-*/
-
-//
 bool comp_pos(const SwSidebarItem* a, const SwSidebarItem* b)
 {
-    // --> OD 2010-01-19 #i88070#
     // sort by anchor position
-//// if position is on the same line, sort by x (Left) position, otherwise by y(Bottom) position
-//// if two notes are at the same position, sort by logical node position
-//    return (a->maLayoutInfo.mPosition.Bottom() == b->maLayoutInfo.mPosition.Bottom())
-//            ? ( ( (a->maLayoutInfo.mPosition.Left() == b->maLayoutInfo.mPosition.Left()) &&
-//                  (a->GetBroadCaster()->ISA(SwFmtFld) && b->GetBroadCaster()->ISA(SwFmtFld)) )
-//                ? *(static_cast<SwFmtFld*>(a->GetBroadCaster())->GetTxtFld()->GetStart()) <
-//                    *(static_cast<SwFmtFld*>(b->GetBroadCaster())->GetTxtFld()->GetStart())
-//                : a->maLayoutInfo.mPosition.Left() < b->maLayoutInfo.mPosition.Left() )
-//            : a->maLayoutInfo.mPosition.Bottom() < b->maLayoutInfo.mPosition.Bottom();
     return a->GetAnchorPosition() < b->GetAnchorPosition();
-    // <--
 }
 
 SwPostItMgr::SwPostItMgr(SwView* pView)
@@ -235,12 +211,7 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExistance, bool b
     mbLayout = bFocus;
     if (pItem->ISA(SwFmtFld))
         mvPostItFlds.push_back(new SwAnnotationItem(static_cast<SwFmtFld*>(pItem), true, bFocus) );
-    /*
-    else
-    if (pItem->ISA(SwRedline))
-        mvPostItFlds.push_back(new SwRedCommentItem( static_cast<SwRedline*>(pItem), true, bFocus)) ;
-    */
-    OSL_ENSURE(pItem->ISA(SwFmtFld) /*|| pItem->ISA(SwRedline)*/,"Mgr::InsertItem: seems like new stuff was added");
+    OSL_ENSURE(pItem->ISA(SwFmtFld),"Mgr::InsertItem: seems like new stuff was added");
     StartListening(*pItem);
 }
 
@@ -323,35 +294,6 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             }
         }
     }
-    /*
-    else if ( rHint.IsA(TYPE(SwRedlineHint) ) )
-    {
-        const SwRedlineHint rRedlineHint = static_cast<const SwRedlineHint&>(rHint);
-           SwRedline* pRedline = const_cast<SwRedline*>(rRedlineHint.GetRedline());
-        switch ( rRedlineHint.Which() )
-        {
-            case SWREDLINE_INSERTED :
-            {
-                bool bEmpty = !HasNotes();
-                InsertItem( pRedline, true, false );
-                if (bEmpty && !mvPostItFlds.empty())
-                    PrepareView(true);
-                break;
-            }
-            case SWREDLINE_REMOVED:
-            {
-                RemoveItem(pRedline);
-                break;
-            }
-            case SWREDLINE_FOCUS:
-            {
-                                if (rRedlineHint.GetView()== mpView)
-                    Focus(rBC);
-                break;
-            }
-        }
-    }
-    */
     else if ( rHint.IsA(TYPE(SwFmtFldHint) ) )
     {
         const SwFmtFldHint& rFmtHint = static_cast<const SwFmtFldHint&>(rHint);
@@ -1113,7 +1055,6 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
                     //(*i) is the last visible item
                     SwSidebarWin_iterator aPrevPostIt = i;
                     --aPrevPostIt;
-                    //lTranslatePos = ( (*aPrevPostIt)->VirtualPos().Y() + (*aPrevPostIt)->VirtualSize().Height() + GetSpaceBetween() ) - (*i)->VirtualPos().Y();
                     lTranslatePos = ( (*aPrevPostIt)->VirtualPos().Y() + (*aPrevPostIt)->VirtualSize().Height() ) - (*i)->VirtualPos().Y();
                     if (lTranslatePos > 0)
                     {
@@ -1168,22 +1109,6 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
     return bScrollbars;
  }
 
-/*
-void SwPostItMgr::AddRedlineComments(bool bCheckExistance, bool bFocus)
-{
-    bool bEmpty = mvPostItFlds.empty();
-    const SwRedlineTbl& aTable = mpView->GetDocShell()->GetDoc()->GetRedlineTbl();
-    for( USHORT i = 0; i < aTable.Count(); ++i )
-    {
-        SwRedline* pRedline = const_cast<SwRedline*>((aTable)[i]);
-        if ( pRedline->GetComment() != String(rtl::OUString::createFromAscii("")) )
-            InsertItem(pRedline, bCheckExistance, bFocus);
-    }
-    if (bEmpty && !mvPostItFlds.empty())
-        PrepareView(true);
- }
- */
-
 void SwPostItMgr::AddPostIts(bool bCheckExistance, bool bFocus)
 {
     bool bEmpty = mvPostItFlds.empty();
@@ -1281,23 +1206,6 @@ void SwPostItMgr::Delete()
         mpWrtShell->DelRight();
     }
 
-/*
-    for(std::list<SwPostItItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
-    {
-        SwPostItItem* pItem = (*i);
-        // stop listening, we delete ourselves
-        EndListening( *(pItem->pFmtFld) );
-        // delete the actual SwPostItField
-        mpWrtShell->GotoField(*pItem->pFmtFld);
-        mpWrtShell->DelRight();
-        // delete visual representation
-        delete pItem->pPostIt;
-        // delete struct saving the pointers
-        delete pItem;
-    }
-    mvPostItFlds.clear();
-*/
-
     mpWrtShell->EndUndo( UNDO_DELETE );
     PrepareView();
     mpWrtShell->EndAllAction();
@@ -1347,14 +1255,6 @@ void SwPostItMgr::Sort(const short aType)
             case SORT_POS:
                 mvPostItFlds.sort(comp_pos);
                 break;
-            /*
-            case SORT_AUTHOR:
-                mvPostItFlds.sort(comp_author);
-                break;
-            case SORT_DATE:
-                mvPostItFlds.sort(comp_date);
-                break;
-            */
         }
     }
 }
@@ -1506,7 +1406,6 @@ void SwPostItMgr::PrepareView(bool bIgnoreCount)
     if (!HasNotes() || bIgnoreCount)
     {
         mpWrtShell->StartAllAction();
-        //mpEditWin->Invalidate(); // really not needed anymore??
         SwRootFrm* pLayout = mpWrtShell->GetLayout();
         if ( pLayout )
             SwPostItHelper::setSidebarChanged( pLayout,
@@ -1627,14 +1526,13 @@ void SwPostItMgr::CorrectPositions()
        return;
 
     // yeah, I know,    if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it
-    // --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
+    // check, if anchor overlay object exists.
     const long aAnchorX = pFirstPostIt->Anchor() 
                           ? mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X()
                           : 0;
     const long aAnchorY = pFirstPostIt->Anchor() 
                           ? mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1
                           : 0;
-    // <-- 
     if (Point(aAnchorX,aAnchorY) != pFirstPostIt->GetPosPixel())
     {
         long aAnchorPosX = 0;
@@ -1643,9 +1541,8 @@ void SwPostItMgr::CorrectPositions()
         {
             for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
             {
-                // --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
+                // check, if anchor overlay object exists.
                 if ( (*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->Anchor() )
-                // <--                                    
                 {
                     aAnchorPosX = mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
                         ? mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Anchor()->GetSeventhPosition().getX()),0)).X()
@@ -1887,7 +1784,6 @@ sal_uInt16 SwPostItMgr::SearchReplace(const SwFmtFld &pFld, const ::com::sun::st
 
 void SwPostItMgr::AssureStdModeAtShell()
 {
-    //#i103373# #i103645#
         // deselect any drawing or frame and leave editing mode
           SdrView* pSdrView = mpWrtShell->GetDrawView();
         if ( pSdrView && pSdrView->IsTextEdit() )
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 0fbd5b2..85df265 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <tools/list.hxx>
 #include <swtypes.hxx>
 #include <hintids.hxx>
@@ -123,13 +122,12 @@
 #include <cmdid.h>
 #include <docvw.hrc>
 #include <uitool.hxx>
-// OD 18.09.2003 #i18732#
 #include <fmtfollowtextflow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <charfmt.hxx>
 #include <numrule.hxx>
 #include <pagedesc.hxx>
-#include <svtools/ruler.hxx> // #i23726#
+#include <svtools/ruler.hxx>
 #include "formatclipboard.hxx"
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
@@ -140,10 +138,8 @@
 
 #include <PostItMgr.hxx>
 
-//JP 11.10.2001: enable test code for bug fix 91313
 //TODO: This one could most probably be removed
 #if defined(DBG_UTIL) && (OSL_DEBUG_LEVEL > 1)
-//#define TEST_FOR_BUG91313
 #endif
 
 using namespace sw::mark;
@@ -181,7 +177,6 @@ Color   SwEditWin::aTextBackColor(COL_YELLOW);
 Color   SwEditWin::aTextColor(COL_RED);
 BOOL    SwEditWin::bTransparentBackColor = FALSE; // Hintergrund nicht transparent
 
-
 extern BOOL     bExecuteDrag;
 
 SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType );
@@ -193,34 +188,27 @@ class SwAnchorMarker
     SdrHdl* pHdl;
     Point aHdlPos;
     Point aLastPos;
-    // --> OD 2010-09-16 #i114522#
     bool bTopRightHandle;
-    // <--
 public:
-    SwAnchorMarker( SdrHdl* pH ) 
+    SwAnchorMarker( SdrHdl* pH )
         : pHdl( pH )
         , aHdlPos( pH->GetPos() )
-        , aLastPos( pH->GetPos() ) 
-        // --> OD 2010-09-16 #i114522#
+        , aLastPos( pH->GetPos() )
         , bTopRightHandle( pH->GetKind() == HDL_ANCHOR_TR )
-        // <--
     {}
     const Point& GetLastPos() const { return aLastPos; }
     void SetLastPos( const Point& rNew ) { aLastPos = rNew; }
     void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); }
     const Point& GetPos() { return pHdl->GetPos(); }
     const Point& GetHdlPos() { return aHdlPos; }
-    void ChgHdl( SdrHdl* pNew ) 
-    { 
+    void ChgHdl( SdrHdl* pNew )
+    {
         pHdl = pNew;
-        // --> OD 2010-09-16 #i114522#
         if ( pHdl )
         {
             bTopRightHandle = (pHdl->GetKind() == HDL_ANCHOR_TR);
         }
-        // <--
     }
-    // --> OD 2010-09-16 #i114522#
     const Point GetPosForHitTest( const OutputDevice& rOut )
     {
         Point aHitTestPos( GetPos() );
@@ -232,12 +220,11 @@ public:
         else
         {
             aHitTestPos += Point( 1, 1 );
-        }             
+        }
         aHitTestPos = rOut.PixelToLogic( aHitTestPos );
-        
+
         return aHitTestPos;
     }
-    // <--
 };
 
 struct QuickHelpData
@@ -271,7 +258,6 @@ struct QuickHelpData
     void FillStrArr( SwWrtShell& rSh, const String& rWord );
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung:   Minimale Bewegung Zittern vermeiden
  --------------------------------------------------------------------*/
@@ -286,7 +272,7 @@ inline BOOL IsMinMove(const Point &rStartPos, const Point &rLPt)
 }
 
 /*--------------------------------------------------------------------
-    JP 30.07.98: fuer MouseButtonDown - feststellen, ob ein DrawObject
+                fuer MouseButtonDown - feststellen, ob ein DrawObject
                 und KEIN SwgFrame getroffen wurde! Shift/Ctrl sollen
                 nur bei DrawObjecte zum Selektieren fuehren, bei SwgFlys
                 ggfs zum ausloesen von Hyperlinks (DownLoad/NewWindow!)
@@ -312,7 +298,6 @@ inline BOOL IsDrawObjSelectable( const SwWrtShell& rSh, const Point& rPt )
     Beschreibung:   Pointer umschalten
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier )
 {
     SwWrtShell &rSh = rView.GetWrtShell();
@@ -326,7 +311,6 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier )
                 delete pUserMarker;
                 pUserMarker = 0L;
             }
-//          rSh.SwCrsrShell::UnSetVisCrsr( rLPt );
             eStyle = POINTER_NOTALLOWED;
         }
         else
@@ -568,7 +552,6 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier )
     Beschreibung: Timer fuer Selektion vergroessern
  --------------------------------------------------------------------*/
 
-
 IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG )
 {
     DBG_PROFSTART(edithdl);
@@ -604,14 +587,14 @@ IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG )
         else
             (rSh.*rSh.fnSetCrsr)( &aModPt, FALSE );
 
-        //fix(24138): Es kann sein, dass der "Sprung" ueber eine Tabelle so
+        // Es kann sein, dass der "Sprung" ueber eine Tabelle so
         //nicht geschafft wird. Deshalb wir hier eben per Up/Down ueber die
         //Tabelle gesprungen.
         const SwRect& rVisArea = rSh.VisArea();
         if( aOldVis == rVisArea && !rSh.IsStartOfDoc() && !rSh.IsEndOfDoc() )
         {
-            //JP 11.10.2001 Bug 72294 - take the center point of VisArea to
-            //              decide in which direction the user want.
+            // take the center point of VisArea to
+            // decide in which direction the user want.
             if( aModPt.Y() < ( rVisArea.Top() + rVisArea.Height() / 2 ) )
                 rSh.Up( TRUE, 1 );
             else
@@ -629,7 +612,6 @@ IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG )
     Beschreibung:
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::JustifyAreaTimer()
 {
     const Rectangle &rVisArea = GetView().GetVisArea();
@@ -668,7 +650,6 @@ inline void SwEditWin::EnterArea()
  Beschreibung:  Modus fuer Rahmen einfuegen
 ------------------------------------------------------------------------*/
 
-
 void SwEditWin::InsFrm(USHORT nCols)
 {
     StdDrawMode( OBJ_NONE, FALSE );
@@ -676,15 +657,10 @@ void SwEditWin::InsFrm(USHORT nCols)
     nInsFrmColCount = nCols;
 }
 
-
-
 void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect )
 {
     SetSdrDrawMode( eSdrObjectKind );
 
-/*  if (GetDrawFuncPtr())
-        GetDrawFuncPtr()->Deactivate();*/
-
     if (bObjSelect)
         rView.SetDrawFuncPtr(new DrawSelection( &rView.GetWrtShell(), this, &rView ));
     else
@@ -695,13 +671,11 @@ void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect )
     if (bObjSelect)
         rView.GetDrawFuncPtr()->Activate( SID_OBJECT_SELECT );
     else
-        rView.GetDrawFuncPtr()->Activate( sal::static_int_cast< USHORT >(eSdrObjectKind) );     // don't know if this is useful at all; but it keeps functionality as it was...
+        rView.GetDrawFuncPtr()->Activate( sal::static_int_cast< USHORT >(eSdrObjectKind) );
     bInsFrm = FALSE;
     nInsFrmColCount = 1;
 }
 
-
-
 void SwEditWin::StopInsFrm()
 {
     if (rView.GetDrawFuncPtr())
@@ -717,7 +691,6 @@ void SwEditWin::StopInsFrm()
 /*--------------------------------------------------------------------
  --------------------------------------------------------------------*/
 
-
 BOOL SwEditWin::IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const
 {
     const SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions();
@@ -744,12 +717,10 @@ BOOL SwEditWin::IsInputSequenceCheckingRequired( const String &rText, const SwPa
     return (0 <= nCTLScriptPos && nCTLScriptPos <= rText.Len());
 }
 
-
 /*--------------------------------------------------------------------
      Beschreibung:  Der Character Buffer wird in das Dokument eingefuegt
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::FlushInBuffer()
 {
     if ( aInBuffer.Len() )
@@ -873,7 +844,6 @@ void SwEditWin::FlushInBuffer()
                 aReq.Done();
             }
         }
-        //#21019# apply CTL and CJK language to the text input
         sal_Bool bLang = true;
         if(eBufferLanguage != LANGUAGE_DONTKNOW)
         {
@@ -895,7 +865,7 @@ void SwEditWin::FlushInBuffer()
                     if ( eLang == eBufferLanguage )
                         // current language attribute equal to language reported from system
                         bLang = sal_False;
-                    else if ( !bInputLanguageSwitched && RES_CHRATR_LANGUAGE == nWhich /* && (eLang&LANGUAGE_MASK_PRIMARY) == LANGUAGE_ENGLISH */ )
+                    else if ( !bInputLanguageSwitched && RES_CHRATR_LANGUAGE == nWhich )
                     {
                         // special case: switching between two "LATIN" languages
                         // In case the current keyboard setting might be suitable for both languages we can't safely assume that the user
@@ -974,14 +944,11 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb )
     SwWrtShell &rSh = rView.GetWrtShell();
     SwRect aTmp = rSh.GetFlyRect();
     if( aTmp.HasArea() &&
-        // --> FME 2005-01-13 #i40348#
         // IsSelObjProtected() seems to be the correct condition, not
         // !HasReadonlySel(), otherwise frame is not moveable if content is
         // protected.
         !rSh.IsSelObjProtected( FLYPROTECT_POS|FLYPROTECT_SIZE ) )
-        // <--
     {
-        // OD 18.09.2003 #i18732# - add item <RES_FOLLOW_TEXT_FLOW>
         SfxItemSet aSet(rSh.GetAttrPool(),
                         RES_FRM_SIZE, RES_FRM_SIZE,
                         RES_VERT_ORIENT, RES_ANCHOR,
@@ -1009,13 +976,12 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb )
 
         SwRect aBoundRect;
         Point aRefPoint;
-        // OD 18.09.2003 #i18732# - adjustment for allowing vertical position
-        //      aligned to page for fly frame anchored to paragraph or to character.
+        // adjustment for allowing vertical position
+        // aligned to page for fly frame anchored to paragraph or to character.
         {
             SwFmtVertOrient aVert( (SwFmtVertOrient&)aSet.Get(RES_VERT_ORIENT) );
             const bool bFollowTextFlow =
                     static_cast<const SwFmtFollowTextFlow&>(aSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
-            // OD 12.11.2003 #i22341# - additional provide content position
             const SwPosition* pToCharCntntPos = ((SwFmtAnchor&)aSet.Get(RES_ANCHOR)).GetCntntAnchor();
             rSh.CalcBoundRect( aBoundRect, eAnchorId,
                                text::RelOrientation::FRAME, aVert.GetRelationOrient(),
@@ -1034,10 +1000,10 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb )
             case MOVE_UP_BIG:
             case MOVE_UP_SMALL: aTmp.Top( aTmp.Top() - nUp ); break;
             case MOVE_RIGHT_SMALL: if( aTmp.Width() < aSnap.Width() + MINFLY ) break;
-                    nRight = aSnap.Width(); // kein break
+                    nRight = aSnap.Width(); // no break
             case MOVE_RIGHT_BIG: aTmp.Left( aTmp.Left() + nRight ); break;
             case MOVE_DOWN_SMALL: if( aTmp.Height() < aSnap.Height() + MINFLY ) break;
-                    nDown = aSnap.Height(); // kein break
+                    nDown = aSnap.Height(); // no break
             case MOVE_DOWN_BIG: aTmp.Top( aTmp.Top() + nDown ); break;
             default: OSL_ENSURE(true, "ChangeFly: Unknown direction." );
         }
@@ -1133,16 +1099,13 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb )
         rSh.EndAllAction();
     }
 }
-/* -----------------------------23.05.2002 11:35------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwEditWin::ChangeDrawing( BYTE nDir )
 {
-    // --> OD 2005-01-31 #i40845# - start undo action in order to get only one
+    // start undo action in order to get only one
     // undo action for this change.
     SwWrtShell &rSh = rView.GetWrtShell();
     rSh.StartUndo();
-    // <--
 
     long nX = 0;
     long nY = 0;
@@ -1206,7 +1169,6 @@ void SwEditWin::ChangeDrawing( BYTE nDir )
             // if the object's position is not protected
             if(0 == (nProtect&FLYPROTECT_POS))
             {
-                // --> FME 2005-04-26 #i47138#
                 // Check if object is anchored as character and move direction
                 BOOL bDummy;
                 const bool bVertAnchor = rSh.IsFrmVertical( TRUE, bDummy );
@@ -1215,7 +1177,6 @@ void SwEditWin::ChangeDrawing( BYTE nDir )
                     !bHoriMove || (rSh.GetAnchorId() != FLY_AS_CHAR);
                 if ( bMoveAllowed )
                 {
-                // <--
                     pSdrView->MoveAllMarked(Size(nX, nY));
                     rSh.SetModified();
                 }
@@ -1271,17 +1232,13 @@ void SwEditWin::ChangeDrawing( BYTE nDir )
         rSh.EndAllAction();
     }
 
-    // --> OD 2005-01-31 #i40845# - end undo action
     rSh.EndUndo();
-    // <--
 }
 
 /*--------------------------------------------------------------------
     Beschreibung:   KeyEvents
  --------------------------------------------------------------------*/
 
-
-
 void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 {
     if( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE &&
@@ -1345,7 +1302,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
     // look for vertical mappings
     if( !bIsDocReadOnly && !rSh.IsSelFrmMode() && !rSh.IsObjSelected() )
     {
-        //JP 21.2.2002: must changed from switch to if, because the Linux
+        // must changed from switch to if, because the Linux
         // compiler has problem with the code. Has to remove if the new general
         // handler exist.
         USHORT nKey = rKEvt.GetKeyCode().GetCode();
@@ -1466,9 +1423,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
     enum SW_KeyState { KS_Start,
                        KS_CheckKey, KS_InsChar, KS_InsTab,
                        KS_NoNum, KS_NumOff, KS_NumOrNoNum, KS_NumDown, KS_NumUp,
-                       // -> #i23725#
                        KS_NumIndentInc, KS_NumIndentDec,
-                       // <- #i23725#
 
                        KS_OutlineLvOff,
                        KS_NextCell, KS_PrevCell, KS_OutlineUp, KS_OutlineDown,
@@ -1506,20 +1461,16 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                        KS_GotoPrevFieldMark,
                        KS_Ende };
 
-
-
     SW_KeyState eKeyState = bIsDocReadOnly ? KS_CheckDocReadOnlyKeys
                                            : KS_CheckKey,
                 eNextKeyState = KS_Ende;
     BYTE nDir = 0;
 
-    // -> #i23725#
     if (nKS_NUMDOWN_Count > 0)
         nKS_NUMDOWN_Count--;
 
     if (nKS_NUMINDENTINC_Count > 0)
         nKS_NUMINDENTINC_Count--;
-    // <- #i23725#
 
     while( KS_Ende != eKeyState )
     {
@@ -1532,8 +1483,8 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 
 #if OSL_DEBUG_LEVEL > 1
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            // JP 19.01.99: zum Umschalten des Cursor Verhaltens in ReadOnly
-            //              Bereichen
+            // zum Umschalten des Cursor Verhaltens in ReadOnly
+            //  Bereichen
             if( 0x7210 == rKeyCode.GetFullCode() )
                 rSh.SetReadOnlyAvailable( !rSh.IsReadOnlyAvailable() );
             else
@@ -1542,7 +1493,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 
             if( !rKeyCode.IsMod2() && '=' == aCh &&
                 !rSh.IsTableMode() && rSh.GetTableFmt() &&
-                rSh.IsSttPara() /*&& rSh.IsEndPara()*/ &&
+                rSh.IsSttPara() &&
                 !rSh.HasReadonlySel() )
             {
                 // in der Tabelle am Anfang der Zelle ein '=' ->
@@ -1619,12 +1570,6 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                     eFlyState = KS_Fly_Change;
                     nDir = MOVE_DOWN_SMALL;
                     goto KEYINPUT_CHECKTABLE;
-//              case KEY_UP | KEY_MOD2 | KEY_SHIFT:
-//                  eKeyState = KS_ColTopBig;
-//                  goto KEYINPUT_CHECKTABLE;
-//              case KEY_DOWN | KEY_MOD2 | KEY_SHIFT:
-//                  eKeyState = KS_ColTopSmall;
-//                  goto KEYINPUT_CHECKTABLE;
 
                 case KEY_UP | KEY_MOD2 | KEY_MOD1:
                     eKeyState = KS_CellBottomSmall;
@@ -1675,7 +1620,6 @@ KEYINPUT_CHECKTABLE:
                     nTblChgSize = pModOpt->GetTblVInsert();
                 }
                     goto KEYINPUT_CHECKTABLE_INSDEL;
-//                case KEY_RIGHT:
                 case KEY_RIGHT | KEY_MOD1:
                 {
                     eTblChgMode = nsTblChgWidthHeightType::WH_FLAG_INSDEL | nsTblChgWidthHeightType::WH_CELL_RIGHT;
@@ -1817,28 +1761,24 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 case KEY_BACKSPACE | KEY_SHIFT:
                     if( !rSh.HasReadonlySel() )
                     {
-                        // #i23725#

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list