Commented code fragments, meaningless and bogus comments removed.

18 files changed, 77 insertions, 287 deletions

diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 78abfd5138fb..8451f2222fa0 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -144,8 +144,6 @@ public:
     /**
        Remove a child.
 
-       OD 2008-02-19 #refactorlists# - no longer virtual
-
        @param pChild     child to be removed
      */
     void RemoveChild( SwNumberTreeNode* pChild );
@@ -174,9 +172,7 @@ public:
      */
     SwNumberTree::tSwNumTreeNumber GetNumber( bool bValidate = true ) const;
 
-    // --> OD 2008-11-26 #158694#
     bool IsContinueingPreviousSubTree() const;
-    // <--
 
     /**
        Returns level numbers of this node.
@@ -241,7 +237,6 @@ public:
 
     /** set level of this node
 
-        OD 2008-03-13 #refactorlists#
         precondition: node is already member of a list tree
 
         @author OD
@@ -277,13 +272,13 @@ public:
        All iterators holding the last valid node in the according list
        of childs are set to the end of this list, thereby stating all
        children in the list are invalid.
-       OD 2007-10-26 #i83479# - made public
+       #i83479# - made public
      */
     void InvalidateTree() const;
 
     /**
        Notifies all invalid children of this node.
-       OD 2007-10-26 #i83479# - made public
+       #i83479# - made public
      */
     void NotifyInvalidChildren();
 
@@ -313,15 +308,14 @@ public:
     */
     void NotifyInvalidSiblings();
 
-    /** notification of all nodes in the list tree on certain list level
-
-        OD 2008-04-17 #refactorlists#
+    /**
+       notification of all nodes in the list tree on certain list level
     */
     void NotifyNodesOnListLevel( const int nListLevel );
 
     /** Invalidation and notification of complete numbering tree
 
-        OD 2006-04-26 #i64010#
+        #i64010#
         Usage: on <IsCounted()> state change its needed to invalidate the
                complete numbering tree due to wide influence of this change.
     */
@@ -344,7 +338,7 @@ public:
 
     /** determines the node, which is preceding the node
 
-        OD 2007-09-06 #i81002#
+        #i81002#
         The search for the preceding node is performed for the tree below the
         <this> node. To search the complete tree, the method has been called for
         the root of the tree.
@@ -353,29 +347,6 @@ public:
     */
     const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const;
 
-//    /**
-//       Returns a string representation of this node.
-
-//       @return the string representation of this node
-//     */
-//    virtual String ToString() const = 0;
-
-//    /**
-//       Print this subtree.
-
-//       @param o              output stream to direct output to
-//       @param rIndent        additional indent for the children of this node
-//       @param rMyIndent      indent to use for this node
-//       @param nDepth         number of levels to print (-1 means all levels)
-
-//       @return output stream after output of this subtree
-//     */
-//    String print(const String & rIndent = String("  ",
-//                                                 RTL_TEXTENCODING_ASCII_US),
-//                 const String & rMyIndent = String("  ",
-//                                                   RTL_TEXTENCODING_ASCII_US),
-//                 int nDepth = -1) const;
-
 #ifdef DBG_UTIL
     static unsigned long GetInstances();
     unsigned long GetSerial();
@@ -423,20 +394,16 @@ protected:
      */
     tSwNumberTreeChildren::size_type GetChildCount() const;
 
-    // --> OD 2006-04-26 #i64010# - made pure virtual
+    // #i64010# - made pure virtual
     virtual bool HasCountedChildren() const = 0;
-    // <--
 
-    // --> OD 2006-04-26 #i64010#
+    // #i64010#
     virtual bool IsCountedForNumbering() const = 0;
-    // <--
 
-    // --> OD 2008-02-19 #refactorlists#
     // method called before this tree node has been added to the list tree
     virtual void PreAdd() = 0;
     // method called after this tree node has been removed from the list tree
     virtual void PostRemove() = 0;
-    // <--
 
 #ifdef __SW_NUMBER_TREE_SANITY_CHECK
     /**
@@ -461,7 +428,6 @@ protected:
     */
     mutable SwNumberTree::tSwNumTreeNumber mnNumber;
 
-    // --> OD 2008-11-26 #158694#
     // boolean indicating, that a node of a not counted parent node is continueing
     // the numbering of parent's previous node sub tree.
     // Example:
@@ -470,7 +436,6 @@ protected:
     //      sdfjlksaf <-- not counted parent node
     //     1.2. lfjlaskf <-- <mbContinueingPreviousSubTree = true>
     mutable bool mbContinueingPreviousSubTree;
-    // <--
 
     /**
        true     this node is a phantom
@@ -522,7 +487,6 @@ protected:
 
     /** Invalidation of all children
 
-        OD 2005-10-19 #126009#
         Usage: on <IsCounted()> state change the children have to be invalidated
     */
     inline void InvalidateChildren()
@@ -532,7 +496,6 @@ protected:
 
     /** Invalidation of parent node, if its not counted.
 
-        OD 2005-10-19 #126009#
         Usage: on <IsCounted()> state change the parent have to be invalidated
     */
     inline void InvalidateNotCountedParent()
@@ -587,7 +550,6 @@ protected:
 
     /** Notification of parent node siblings, if its not counted.
 
-        OD 2005-10-19 #126009#
         Usage: on <IsCounted()> state change the parent node and its siblings
                have to be notified.
     */
@@ -601,8 +563,6 @@ protected:
 
     /** notification of children nodes on certain depth
 
-        OD 2008-04-17 #refactorlists#
-
         @author OD
     */
     void NotifyChildrenOnDepth( const int nDepth );
@@ -680,8 +640,6 @@ protected:
     /**
        Return if phantoms are counted.
 
-       OD 2008-02-19 #refactorlists# - pure virtual now
-
        @retval true phantoms are counted
        @retval false else
      */
@@ -695,9 +653,7 @@ protected:
      */
     bool HasOnlyPhantoms() const;
 
-    // --> OD 2005-10-27 #126009#
     bool HasPhantomCountedParent() const;
-    // <--
 
     /**
         HB, OD : return node, if it isn't a phantom, otherwise return first
@@ -728,7 +684,6 @@ protected:
     /** Moves all children of this node that are greater than a given node
         to the destination node.
 
-        OD 2005-10-14 #125991#
         distinguish between node for comparing, whose children are greater,
         and the destination node.
 
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 96d67dedd50c..5a44c3a2bc5e 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -47,7 +47,6 @@
 //***********************************************************
 
 struct CollName {
-//      const char* pStr;
         ULONG nCnd;
         ULONG nSubCond;
     };
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index fe37e4c465a9..3b6244943eca 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -73,14 +73,10 @@ class SW_DLLPUBLIC SwChapterField : public SwField
 public:
     SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
 
-    // --> OD 2008-02-14 #i53420#
-//    void ChangeExpansion( const SwFrm*,
-//                          const SwTxtNode*,
-//                          BOOL bSrchNum = FALSE);
+    // #i53420#
     void ChangeExpansion( const SwFrm*,
                           const SwCntntNode*,
         BOOL bSrchNum = FALSE);
-    // <--
     void ChangeExpansion(const SwTxtNode &rNd, BOOL bSrchNum);
 
     virtual String   Expand() const;
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 7cc143514541..01ccfc04bda4 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -132,7 +132,7 @@ public:
 inline  void SwDBField::SetExpansion(const String& rStr)
     { aContent = rStr; }
 
-// wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt)
+// set from UpdateExpFlds (the Node-Position is known there)
 inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
     { bIsInBodyTxt = bIsInBody; }
 
@@ -156,7 +156,7 @@ public:
     inline const SwDBData&  GetRealDBData() { return aDBData; }
 
     SwDBData                GetDBData(SwDoc* pDoc);
-    void                    SetDBData(const SwDBData& rDBData); // #111840#
+    void                    SetDBData(const SwDBData& rDBData);
 
     // Name oder Inhalt
     virtual String          GetCntnt(BOOL bName = FALSE) const;
@@ -166,7 +166,6 @@ public:
     virtual void            SetSubType(USHORT nType);
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Datenbankfeld Naechster Satz
  --------------------------------------------------------------------*/
@@ -179,7 +178,6 @@ public:
     virtual SwFieldType*    Copy() const;
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Naechsten Datensatz mit Bedingung
  --------------------------------------------------------------------*/
@@ -225,7 +223,6 @@ public:
     virtual SwFieldType*    Copy() const;
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Datensatz mit Nummer xxx
                   Die Nummer steht in nFormat
@@ -335,7 +332,6 @@ inline long SwDBSetNumberField::GetSetNumber() const
 inline void SwDBSetNumberField::SetSetNumber(long nNum)
     { nNumber = nNum; }
 
-
 #endif // _DBFLD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index ce751a65f4d7..db18da0216ef 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -82,7 +82,6 @@ SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem);
 SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem);
 SW_DLLPUBLIC const char * dbg_out(const SfxItemSet & rSet);
 SW_DLLPUBLIC const char * dbg_out(SwNodes & rNodes);
-// const char * dbg_out(SwOutlineNodes & rNodes);
 SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos);
 SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam);
 SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum);
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e5d61eda362d..091cde1fd98b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -249,7 +249,7 @@ namespace sfx2 {
 typedef SwPageDesc* SwPageDescPtr;
 SV_DECL_PTRARR_DEL( SwPageDescs, SwPageDescPtr, 4, 4 )
 
-// forward declartion
+// forward declaration
 void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem );
 
 // global function to start grammar checking in the document
@@ -285,10 +285,10 @@ class SW_DLLPUBLIC SwDoc :
 
     // -------------------------------------------------------------------
     // die Objecte
-    SwNodes     aNodes;                 // Inhalt des Dokumentes
-    SwNodes     aUndoNodes;             // Inhalt fuer das Undo
-    SwAttrPool* mpAttrPool;             // der Attribut Pool
-    SwPageDescs aPageDescs;             // PageDescriptoren
+    SwNodes     aNodes;                 // document content
+    SwNodes     aUndoNodes;             // content for undo
+    SwAttrPool* mpAttrPool;             // attribute pool
+    SwPageDescs aPageDescs;             // PageDescriptors
     Link        aOle2Link;              // OLE 2.0-Benachrichtigung
     /* @@@MAINTAINABILITY-HORROR@@@
        Timer should not be members of the model
@@ -310,13 +310,13 @@ class SW_DLLPUBLIC SwDoc :
     // die Pointer
                                 //Defaultformate
     SwFrmFmt        *pDfltFrmFmt;
-     SwFrmFmt       *pEmptyPageFmt;     // Format fuer die Default-Leerseite.
+     SwFrmFmt       *pEmptyPageFmt;     // Format for the default empty page
     SwFrmFmt        *pColumnContFmt;    // Format fuer Spaltencontainer
     SwCharFmt       *pDfltCharFmt;
     SwTxtFmtColl    *pDfltTxtFmtColl;   // Defaultformatcollections
     SwGrfFmtColl    *pDfltGrfFmtColl;
 
-    SwFrmFmts       *pFrmFmtTbl;        // Formattabellen
+    SwFrmFmts       *pFrmFmtTbl;        // Format table
     SwCharFmts      *pCharFmtTbl;
     SwSpzFrmFmts    *pSpzFrmFmtTbl;
     SwSectionFmts   *pSectionFmtTbl;
@@ -416,7 +416,7 @@ private:
     ::std::auto_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry;
 
     // -------------------------------------------------------------------
-    // sonstige
+    // other
     sal_uInt16  nUndoPos;           // akt. Undo-InsertPosition (fuers Redo!)
     sal_uInt16  nUndoSavePos;       // Position im Undo-Array, ab der das Doc
                                     // nicht als modifiziert gilt
@@ -484,7 +484,7 @@ private:
     bool mbPurgeOLE              : 1;    // TRUE: Purge OLE-Objects
     bool mbKernAsianPunctuation  : 1;    // TRUE: kerning also for ASIAN punctuation
     bool mbReadlineChecked       : 1;    // TRUE: if the query was already shown
-    bool mbLinksUpdated          : 1;    // OD 2005-02-11 #i38810#
+    bool mbLinksUpdated          : 1;    // #i38810#
                                          // flag indicating, that the links have been updated.
     bool mbClipBoard             : 1;    // true: this document represents the clipboard
     bool mbColumnSelection       : 1;    // true: this content has bee created by a column selection
@@ -569,30 +569,30 @@ private:
     bool mbAddFlyOffsets                    : 1;
     bool mbAddExternalLeading               : 1;
     bool mbUseHiResolutionVirtualDevice     : 1;
-    bool mbOldLineSpacing                   : 1;    // OD  2004-01-06 #i11859#
-    bool mbAddParaSpacingToTableCells       : 1;    // OD  2004-02-16 #106629#
-    bool mbUseFormerObjectPos               : 1;    // OD  2004-03-12 #i11860#
-    bool mbUseFormerTextWrapping            : 1;    // FME 2005-05-11 #108724#
-    bool mbConsiderWrapOnObjPos             : 1;    // OD  2004-05-05 #i28701#
+    bool mbOldLineSpacing                   : 1;    // #i11859#
+    bool mbAddParaSpacingToTableCells       : 1;
+    bool mbUseFormerObjectPos               : 1;    // #i11860#
+    bool mbUseFormerTextWrapping            : 1;
+    bool mbConsiderWrapOnObjPos             : 1;    // #i28701#
                                                     // TRUE: object positioning algorithm has consider the wrapping style of                                                    //       the floating screen objects as given by its attribute 'WrapInfluenceOnObjPos'
 
     // non-ui-compatibility flags:
-    bool mbOldNumbering                             : 1;   // HBRINKM #111955#
-    bool mbIgnoreFirstLineIndentInNumbering         : 1;   // FME 2005-05-30# i47448#
-    bool mbDoNotJustifyLinesWithManualBreak         : 1;   // FME 2005-06-08 #i49277#
-    bool mbDoNotResetParaAttrsForNumFont            : 1;   // FME 2005-08-11 #i53199#
-    bool mbTableRowKeep                             : 1;   // FME 2006-02-10 #131283#
-    bool mbIgnoreTabsAndBlanksForLineCalculation    : 1;   // FME 2006-03-01 #i3952#
-    bool mbDoNotCaptureDrawObjsOnPage               : 1;   // OD 2006-03-14 #i62875#
+    bool mbOldNumbering                             : 1;
+    bool mbIgnoreFirstLineIndentInNumbering         : 1;   // #i47448#
+    bool mbDoNotJustifyLinesWithManualBreak         : 1;   // #i49277#
+    bool mbDoNotResetParaAttrsForNumFont            : 1;   // #i53199#
+    bool mbTableRowKeep                             : 1;
+    bool mbIgnoreTabsAndBlanksForLineCalculation    : 1;   // #i3952#
+    bool mbDoNotCaptureDrawObjsOnPage               : 1;   // #i62875#
     bool mbOutlineLevelYieldsOutlineRule            : 1;
-    bool mbClipAsCharacterAnchoredWriterFlyFrames   : 1;   // OD 2006-04-13 #b6402800#
-    bool mbUnixForceZeroExtLeading                  : 1;   // FME 2006-10-09 #i60945#
-    bool mbOldPrinterMetrics                        : 1;   // FME 2007-05-14 #147385#
+    bool mbClipAsCharacterAnchoredWriterFlyFrames   : 1;   // #b6402800#
+    bool mbUnixForceZeroExtLeading                  : 1;   // #i60945#
+    bool mbOldPrinterMetrics                        : 1;
     bool mbTabRelativeToIndent                      : 1;   // #i24363# tab stops relative to indent
     bool mbProtectForm                              : 1;
     bool mbInvertBorderSpacing                      : 1;
     bool mbCollapseEmptyCellPara                    : 1;
-    bool mbTabAtLeftIndentForParagraphsInList;             // OD 2008-06-05 #i89181# - see above
+    bool mbTabAtLeftIndentForParagraphsInList;             // #i89181# - see above
 
     sal_uInt32  n32DummyCompatabilityOptions1;
     sal_uInt32  n32DummyCompatabilityOptions2;
@@ -605,7 +605,7 @@ private:
     static SwAutoCompleteWord *pACmpltWords;    // Liste aller Worte fuers AutoComplete
     static sal_uInt16 nUndoActions;     // anzahl von Undo ::com::sun::star::chaos::Action
 
-    //---------------- privat Methods ------------------------------
+    //---------------- private Methods ------------------------------
     void checkRedlining(RedlineMode_t& _rReadlineMode);
 
     sal_Bool DelUndoObj( sal_uInt16 nEnde  );   // loescht alle UndoObjecte vom Anfang
@@ -1067,11 +1067,11 @@ public:
     SwFlyFrmFmt  *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom);
     SwDrawFrmFmt *MakeDrawFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
 
-    // JP 08.05.98: fuer Flys muss jetzt diese Schnittstelle benutzt
-    //              werden. pAnchorPos muss gesetzt sein, wenn keine
-    //              Seitenbindung vorliegt UND der ::com::sun::star::chaos::Anchor nicht schon
-    //              im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
-    /* #109161# new parameter bCalledFromShell
+    // fuer Flys muss jetzt diese Schnittstelle benutzt
+    // werden. pAnchorPos muss gesetzt sein, wenn keine
+    // Seitenbindung vorliegt UND der ::com::sun::star::chaos::Anchor nicht schon
+    // im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
+    /* new parameter bCalledFromShell
 
        TRUE: An existing adjust item at pAnchorPos is propagated to
        the content node of the new fly section. That propagation only
@@ -1498,16 +1498,6 @@ public:
                      const bool bResetIndentAttrs = false );
     void SetCounted( const SwPaM&, bool bCounted);
 
-    // no longer needed.
-    // SwDoc::SetNumRule( rPaM, rNumRule, false, <ListId>, sal_True, true ) have to be used instead.
-//    /**
-//       Replace numbering rules in a PaM by another numbering rule.
-
-//       \param rPaM         PaM to replace the numbering rules in
-//       \param rNumRule     numbering rule to replace the present numbering rules
-//     */
-//    void ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule);
-
     void MakeUniqueNumRules(const SwPaM & rPaM);
 
     void SetNumRuleStart( const SwPosition& rPos, sal_Bool bFlag = sal_True );
@@ -2122,7 +2112,7 @@ namespace docfunc
 
     /** method to check, if the outline style has to written as a normal list style
 
-        OD 2006-09-27 #i69627#
+        #i69627#
         The outline style has to written as a normal list style, if a parent
         paragraph style of one of the paragraph styles, which are assigned to
         the list levels of the outline style, has a list style set or inherits
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 2c5e509dc74e..6519e74927c7 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -80,7 +80,6 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
                                             // Grafik-Links. Sind alle da,
                                             // dann ist Doc voll. geladen
 
-    //SvPersistRef            xOLEChildList;  // fuers RemoveOLEObjects
     comphelper::EmbeddedObjectContainer*    pOLEChildList;
     sal_Int16               nUpdateDocMode; // contains the com::sun::star::document::UpdateDocMode
     bool                    bInUpdateFontList; //prevent nested calls of UpdateFontList
@@ -258,15 +257,12 @@ public:
                         BOOL bColumn = FALSE,
                         SwWrtShell*     pActShell = 0 );
 
-    // --> OD 2006-11-07 #i59688#
+    // #i59688#
     // linked graphics are now loaded on demand.
     // Thus, loading of linked graphics no longer needed and necessary for
     // the load of document being finished.
-//    // Timer starten fuers ueberpruefen der Grafik-Links. Sind alle
-//    // vollstaendig geladen, dann ist das Doc fertig
-//    void StartLoadFinishedTimer();
+
     void LoadingFinished();
-    // <--
 
     // eine Uebertragung wird abgebrochen (wird aus dem SFX gerufen)
     virtual void CancelTransfers();
@@ -291,15 +287,14 @@ public:
 
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >  GetEventNames();
 
-    // --> FME 2004-08-05 #i20883# Digital Signatures and Encryption
+    // #i20883# Digital Signatures and Encryption
     virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
-    // <--
 
-    // --> FME 2005-02-25 #i42634# Overwrites SfxObjectShell::UpdateLinks
+
+    // #i42634# Overwrites SfxObjectShell::UpdateLinks
     // This new function is necessary to trigger update of links in docs
     // read by the binary filter:
     virtual void UpdateLinks();
-    // <--
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
                                 GetController();
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c84d3b24e542..787646081ed7 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -72,7 +72,6 @@ class SwAutoCompleteWord;
 class SwFmtRefMark;
 
 class SwNumRule;        // Numerierung
-//class SwNodeNum;      // Numerierung
 
 class SwUndoIds;        // fuer Undo
 class SwTxtFmtColl;
@@ -228,7 +227,6 @@ public:
     //  alle Cursor. Copy und Paste muss aufgrund der FlyFrames in
     //  der FEShell stehen!
     // kopiere alle Selectionen und das Doc
-    //JP 21.10.96: und fuer die SVX-Autokorrektur
     BOOL _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
 
     long SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE );
@@ -246,10 +244,7 @@ public:
     // Anwenden / Entfernen von Attributen
     // liefert Attribute im angeforderten AttributSet. Wenn nicht eindeutig
     // steht im Set ein DONT_CARE !!
-    // --> OD 2008-01-16 #newlistlevelattrs#
-    // Renaming method to <GetCurAttr(..)> indicating that the attributes at
-    // the current cursors are retrieved.
-    // Introduce 2nd optional parameter <bMergeIndentValuesOfNumRule>.
+    // 2nd optional parameter <bMergeIndentValuesOfNumRule>.
     // If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of
     // the corresponding list level of an applied list style is merged into
     // the requested item set as a LR-SPACE item, if corresponding node has not
@@ -257,7 +252,6 @@ public:
     // level is SvxNumberFormat::LABEL_ALIGNMENT.
     BOOL GetCurAttr( SfxItemSet& ,
                      const bool bMergeIndentValuesOfNumRule = false ) const;
-    // <--
     void SetAttr( const SfxPoolItem&, USHORT nFlags = 0 );
     void SetAttr( const SfxItemSet&, USHORT nFlags = 0 );
 
@@ -305,11 +299,10 @@ public:
     USHORT GetTxtFmtCollCount() const;
     SwTxtFmtColl& GetTxtFmtColl( USHORT nTxtFmtColl) const;
     SwTxtFmtColl* GetCurTxtFmtColl() const;
-    // --> OD 2007-11-06 #i62675#
+    // #i62675#
     // Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)>
     void SetTxtFmtColl( SwTxtFmtColl*,
                         bool bResetListAttrs = false );
-    // <--
     SwTxtFmtColl *MakeTxtFmtColl(const String &rFmtCollName,
         SwTxtFmtColl *pDerivedFrom = 0);
     void FillByEx(SwTxtFmtColl*, BOOL bReset = FALSE);
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 8ad32b06ab70..34ab59ce71da 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -161,7 +161,6 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType
 {
     String      sName;
     const SwNode* pOutlChgNd;
-//  sal_Unicode cDelim;
     String      sDelim;
     USHORT      nType;
     BYTE        nLevel;
@@ -193,8 +192,6 @@ public:
     String MakeSeqName( USHORT nSeqNo );
 
     // Seqencefelder ggfs. Kapitelweise numerieren
-//  sal_Unicode GetDelimiter() const        { return cDelim; }
-//  void SetDelimiter( sal_Unicode c )      { cDelim = c; }
     const String& GetDelimiter() const      { return sDelim; }
     void SetDelimiter( const String& s )    { sDelim = s; }
     BYTE GetOutlineLvl() const              { return nLevel; }
@@ -396,11 +393,6 @@ public:
 };
 
 
-// MSC will den hier nicht
-//typedef void (SwField:: *FnScanFormel)( const SwTable&, String&,
-//                                   String&, String* = 0, void* = 0 );
-
-
 class SwTblField : public SwValueField, public SwTableFormula
 {
     String      sExpand;
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index c0c358b79ed6..ccc2ad73452b 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -39,7 +39,6 @@ class SwNodeIndex;
 class SW_DLLPUBLIC SwPosFlyFrm
 {
     const SwFrmFmt* pFrmFmt;    // das FlyFrmFmt
-//  SwPosition* pPos;           // Position in den ContentNode
     SwNodeIndex* pNdIdx;        // es reicht ein Index auf den Node
     UINT32 nOrdNum;
 public:
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index ecb2de67cfbb..a875ec21e017 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -45,8 +45,6 @@ class SwDoc;
 
 class SW_DLLPUBLIC SwFmt : public SwModify
 {
-//  friend class SwSwgReader;
-//  friend class SwSwgWriter;
 
     String aFmtName;
     SwAttrSet aSet;
@@ -101,19 +99,14 @@ public:
                                           BOOL bInParents = TRUE ) const;
     inline SfxItemState GetItemState( USHORT nWhich, BOOL bSrchInParent = TRUE,
                                     const SfxPoolItem **ppItem = 0 ) const;
-    // --> OD 2008-03-03 #refactorlists#
-    // methods renamed and made virtual
     virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr );
     virtual BOOL SetFmtAttr( const SfxItemSet& rSet );
     virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
-    // <--
 
-    // --> OD 2007-01-24 #i73790#
-    // Method renamed and made virtual
+
     // Nimmt alle Hints aus dem Delta-Array,
     // liefert die Anzahl der geloeschten Hints
     virtual USHORT ResetAllFmtAttr();
-    // <--
 
     inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; }
     inline BOOL IsDefault() const { return DerivedFrom() == 0; }
@@ -187,7 +180,6 @@ public:
     //              den Parents gesucht werden soll. Wird nichts gefunden,
     //              wird das deflt. Attribut returnt.
     // Charakter-Attribute  - impl. steht im charatr.hxx
-    // AMA 12.10.94: Umstellung von SwFmt... auf Svx...
     inline const SvxPostureItem      &GetPosture( BOOL = TRUE ) const;
     inline const SvxWeightItem       &GetWeight( BOOL = TRUE ) const;
     inline const SvxShadowedItem     &GetShadowed( BOOL = TRUE ) const;
@@ -264,9 +256,9 @@ public:
     inline const SvxFrameDirectionItem    &GetFrmDir( BOOL = TRUE ) const;
     inline const SwTextGridItem         &GetTextGrid( BOOL = TRUE ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const;
-    // OD 18.09.2003 #i18732#
+    // #i18732#
     inline const SwFmtFollowTextFlow    &GetFollowTextFlow(BOOL = TRUE) const;
-    // OD 2004-05-05 #i28701#
+    // #i28701#
     inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const;
 
     // Grafik-Attribute - impl. steht im grfatr.hxx
@@ -308,7 +300,6 @@ public:
 
     /** SwFmt::IsBackgroundTransparent - for feature #99657#
 
-        OD 22.08.2002
         Virtual method to determine, if background of format is transparent.
         Default implementation returns false. Thus, subclasses have to overload
         method, if the specific subclass can have a transparent background.
@@ -321,7 +312,6 @@ public:
 
     /** SwFmt::IsShadowTransparent - for feature #99657#
 
-        OD 22.08.2002
         Virtual method to determine, if shadow of format is transparent.
         Default implementation returns false. Thus, subclasses have to overload
         method, if the specific subclass can have a transparent shadow.
@@ -333,7 +323,7 @@ public:
     virtual sal_Bool IsShadowTransparent() const;
 };
 
-// --------------- inline Implementierungen ------------------------
+// --------------- inline Implementations ------------------------
 
 inline const SfxPoolItem& SwFmt::GetFmtAttr( USHORT nWhich,
                                              BOOL bInParents ) const
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index bcf7eae151eb..961ae8be2c6b 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -64,7 +64,6 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
     sal_Bool    bIsConvSpecial; // true if special regions: header, footer, ... should be converted
     sal_Bool    bStartDone;
     sal_Bool    bEndDone;
-//    sal_Bool    bLastRet;
 
     // from SvxSpellWrapper copied and modified
     sal_Bool    ConvNext_impl();        // former SpellNext
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 125f7cadfb7d..de3556ac600a 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -61,7 +61,6 @@ class SvStream;
 class SvStrings;
 class SvxFontItem;
 class SvxMacroTableDtor;
-//class Sw3Io;
 class SwCntntNode;
 class SwCrsrShell;
 class SwDoc;
@@ -175,18 +174,15 @@ class SwReader: public SwDocFac
 public:
     /*
      * Initiales Einlesen. Dokument wird erst beim Read(..) angelegt.
-     * JP 25.04.95: oder falls es mitgegeben wird, in dieses.
+     *  oder falls es mitgegeben wird, in dieses.
      *              Sonderfall fuer Load mit Sw3Reader
      */
-    //SwReader( SotStorage&, const String& rFilename, SwDoc *pDoc = 0 );
-    //SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwDoc *pDoc = 0 );
     SwReader( SfxMedium&, const String& rFilename, SwDoc *pDoc = 0 );
     /*
      * In ein existierendes Dokument einlesen, Dokument und
      * Position im Dokument werden aus dem SwPaM uebernommen.
      */
     SwReader( SvStream&, const String& rFilename, const String& rBaseURL, SwPaM& );
-    //SwReader( SotStorage&, const String& rFilename, SwPaM& );
     SwReader( SfxMedium&, const String& rFilename, SwPaM& );
     SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwPaM& );
 
@@ -209,7 +205,6 @@ protected:
 
 
 
-/*  */
 /****************  SPEZIELLE Reader ************************/
 
 // spezielle - Reader koennen beides sein !! (Excel, W4W, .. )
@@ -221,7 +216,6 @@ class SW_DLLPUBLIC Reader
     friend class SwReader;
     SwDoc* pTemplate;
     String aTemplateNm;
-    //String sBaseURL;
 
     Date aDStamp;
     Time aTStamp;
@@ -306,11 +300,6 @@ public:
     AsciiReader(): Reader() {}
 };
 
-/*class SwgReader: public Reader
-{
-    virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
-};
-*/
 class SW_DLLPUBLIC StgReader : public Reader
 {
     String aFltName;
@@ -325,22 +314,6 @@ public:
 };
 
 
-/*class Sw3Reader : public StgReader
-{
-    Sw3Io* pIO;
-    virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
-public:
-    Sw3Reader() : pIO( 0 ) {}
-
-    void   SetSw3Io( Sw3Io* pIo )     { pIO = pIo; }
-
-    // read the sections of the document, which is equal to the medium.
-    // returns the count of it
-    virtual USHORT GetSectionList( SfxMedium& rMedium,
-                                SvStrings& rStrings ) const;
-};*/
-
-/*  */
 ////////////////////////////////////////////////////////////////////////////
 
 // Der uebergebene Stream muss dynamisch angelegt werden und
@@ -351,8 +324,6 @@ class SwImpBlocks;
 
 class SW_DLLPUBLIC SwTextBlocks
 {
-//  friend class Sw2TextBlocks;
-//  friend class Sw3IoImp;
     SwImpBlocks* pImp;
     ULONG        nErr;
 
@@ -413,7 +384,6 @@ extern void _FinitFilter();
 
 extern SwRead ReadAscii, /*ReadSwg, ReadSw3, */ReadHTML, ReadXML;
 
-//SW_DLLPUBLIC SwRead SwGetReaderSw3();
 SW_DLLPUBLIC SwRead SwGetReaderXML();
 
 // END source/filter/basflt/fltini.cxx
@@ -422,7 +392,6 @@ SW_DLLPUBLIC SwRead SwGetReaderXML();
 extern BOOL SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx
 
 
-/*  */
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -495,7 +464,6 @@ public:
     virtual void SetPasswd( const String& );
     virtual void SetVersion( const String&, long );
     virtual BOOL IsStgWriter() const;
-//  virtual BOOL IsSw3Writer() const;
 
     void SetShowProgress( BOOL bFlag = FALSE )  { bShowProgress = bFlag; }
 
@@ -578,22 +546,6 @@ public:
     SotStorage& GetStorage() const       { return *pStg; }
 };
 
-/*class Sw3Writer : public StgWriter
-{
-    Sw3Io* pIO;
-    BOOL bSaveAs : 1;
-
-    virtual ULONG WriteStorage();
-    virtual ULONG WriteMedium( SfxMedium& );
-
-public:
-    Sw3Writer() : pIO( 0 ), bSaveAs( FALSE ) {}
-
-    virtual BOOL IsSw3Writer() const;
-};
-
-*/
-
 // Schnittstellenklasse fuer den allgemeinen Zugriff auf die
 // speziellen Writer
 
@@ -608,8 +560,6 @@ class SwWriter
     SwCrsrShell *pShell;
     SwDoc &rDoc;
 
-    //String sBaseURL;
-
     BOOL bWriteAll;
 
 public:
@@ -619,19 +569,13 @@ public:
     SwWriter( SvStream&, SwDoc & );
     SwWriter( SvStream&, SwPaM &, BOOL bWriteAll = FALSE );
 
-//  SwWriter( SotStorage&, SwCrsrShell &,BOOL bWriteAll = FALSE );
     SwWriter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, SwDoc& );
-//  SwWriter( SotStorage&, SwPaM&, BOOL bWriteAll = FALSE );
 
     SwWriter( SfxMedium&, SwCrsrShell &,BOOL bWriteAll = FALSE );
     SwWriter( SfxMedium&, SwDoc & );
-//  SwWriter( SfxMedium&, SwPaM&, BOOL bWriteAll = FALSE );
-
-    //const String&       GetBaseURL() const { return sBaseURL;}
 };
 
 
-/*  */
 /////////////////////////////////////////////////////////////////////////////
 
 typedef Reader* (*FnGetReader)();
@@ -671,7 +615,6 @@ namespace SwReaderWriter
 
 void GetRTFWriter( const String&, const String&, WriterRef& );
 void GetASCWriter( const String&, const String&, WriterRef& );
-//void GetSw3Writer( const String&, const String&, WriterRef& );
 void GetHTMLWriter( const String&, const String&, WriterRef& );
 void GetXMLWriter( const String&, const String&, WriterRef& );
 void GetWW8Writer( const String&, const String&, WriterRef& );
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index 82dddd49cecc..186af3878cbf 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -44,10 +44,10 @@ public:
     inline SwRect( const Point& rLT, const Point& rRB );
     inline SwRect( long X, long Y, long Width, long Height );
 
-        //SV-SS z.B. SwRect( pWin->GetClipRect() );
+        //SV-SS e.g. SwRect( pWin->GetClipRect() );
     SwRect( const Rectangle &rRect );
 
-    //Set-Methoden
+    //Set-Methods
     inline void Chg( const Point& rNP, const Size &rNS );
     inline void Pos(  const Point& rNew );
     inline void Pos( const long nNewX, const long nNewY );
@@ -60,7 +60,7 @@ public:
     inline void Top( const long nTop );
     inline void Bottom( const long nBottom );
 
-    //Get-Methoden
+    //Get-Methods
     inline const Point &Pos()  const;
     inline const Size  &SSize() const;
     inline long Width()  const;
@@ -104,13 +104,9 @@ public:
     inline SwRect &operator+=( const Size &rSz );
     inline SwRect &operator-=( const Size &rSz );
 
-    //SV-SS z.B. pWin->DrawRect( aSwRect.SVRect() );
+    //SV-SS e.g. pWin->DrawRect( aSwRect.SVRect() );
     inline Rectangle  SVRect() const;
 
-    //Zortech wuerde hier fehlerhaften Code erzeugen.
-//  inline operator SRectangle()  const;
-//  inline operator Rectangle() const { return Rectangle( aPos, aSize ); }
-
     // Ausgabeoperator fuer die Debugging-Gemeinde
     friend SvStream &operator<<( SvStream &rStream, const SwRect &rRect );
 
@@ -158,7 +154,7 @@ public:
     BOOL OverStepRight( long ) const;
 };
 
-// Implementation in in swrect.cxx
+// Implementation in swrect.cxx
 extern SvStream &operator<<( SvStream &rStream, const SwRect &rRect );
 
 typedef void (SwRect:: *SwRectSet)( const long nNew );
@@ -170,7 +166,7 @@ typedef long (SwRect:: *SwRectDist)( long ) const;
 typedef void (SwRect:: *SwRectSetTwice)( long, long );
 typedef void (SwRect:: *SwRectSetPos)( const Point& );
 
-//---------------------------------- Set-Methoden
+//  Set-Methods
 inline void SwRect::Chg( const Point& rNP, const Size &rNS )
 {
     m_Point = rNP;
@@ -221,7 +217,7 @@ inline void SwRect::Bottom( const long nBottom )
     m_Size.setHeight(nBottom - m_Point.getY() + 1);
 }
 
-//----------------------------------- Get-Methoden
+// Get-Methods
 inline const Point &SwRect::Pos()  const
 {
     return m_Point;
@@ -263,7 +259,7 @@ inline long SwRect::Bottom() const
     return m_Size.getHeight() ? m_Point.getY() + m_Size.getHeight() - 1 : m_Point.getY();
 }
 
-//----------------------------------- operatoren
+// operators
 inline SwRect &SwRect::operator = ( const SwRect &rRect )
 {
     m_Point = rRect.m_Point;
@@ -304,7 +300,7 @@ inline SwRect &SwRect::operator-=( const Size &rSz )
 }
 
 
-//--------------------------- Sonstiges
+// other
 inline Rectangle SwRect::SVRect() const
 {
     ASSERT( !IsEmpty(), "SVRect() without Width or Height" );
@@ -334,7 +330,7 @@ inline void SwRect::Clear()
     m_Size.setHeight(0);
 }
 
-//-------------------------- CToren
+// constructors
 inline SwRect::SwRect() :
     m_Point( 0, 0 ),
     m_Size( 0, 0 )
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 7c8805416c5f..4289039a7741 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -364,8 +364,6 @@ class SW_DLLPUBLIC SwForm
     TOXTypes    eType;
     USHORT      nFormMaxLevel;
 
-    //USHORT    nFirstTabPos; -> Value in tab token
-//  BOOL    bHasFirstTabPos : 1;
     BOOL    bGenerateTabPos : 1;
     BOOL    bIsRelTabPos : 1;
     BOOL    bCommaSeparated : 1;
@@ -466,7 +464,6 @@ namespace nsSwTOOElements
     const SwTOOElements TOO_CHART           = 0x02;
     const SwTOOElements TOO_CALC            = 0x08;
     const SwTOOElements TOO_DRAW_IMPRESS    = 0x10;
-//  const SwTOOElements TOO_IMPRESS         = 0x20;
     const SwTOOElements TOO_OTHER           = 0x80;
 }
 
@@ -770,9 +767,6 @@ inline USHORT SwTOXBase::GetLevel() const
 
 inline void SwTOXBase::SetTemplateName(const String& rName)
 {
-//  ASSERT(GetTOXType()->GetType() == TOX_USER, "Falscher Feldtyp");
-//  ASSERT(aData.pTemplateName, "pTemplateName == 0");
-//  (*aData.pTemplateName) = rName;
     DBG_WARNING("SwTOXBase::SetTemplateName obsolete");
     aStyleNames[0] = rName;
 
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index c0fc440ca5dd..0b1f93e9b057 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -44,8 +44,6 @@ public:
     // @@@ semantic: no copy ctor.
     SwUnoCrsr( SwUnoCrsr& );
 private:
-    // forbidden and not implemented.
-    //SwUnoCrsr( const SwUnoCrsr& );
     SwUnoCrsr & operator= ( const SwUnoCrsr& );
 
 protected:
@@ -56,8 +54,6 @@ protected:
 
 public:
 
-//  virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
-
     // gibt es eine Selection vom Content in die Tabelle
     // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
     virtual BOOL IsSelOvr( int eFlags =
@@ -101,8 +97,6 @@ public:
     SwUnoTableCrsr( const SwPosition& rPos );
     virtual ~SwUnoTableCrsr();
 
-//  virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
-
     // gibt es eine Selection vom Content in die Tabelle
     // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
     virtual BOOL IsSelOvr( int eFlags =
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 971f9881d2d4..0bbf6447bc58 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <calbck.hxx>
 
-
 #include <com/sun/star/style/XAutoStyleFamily.hpp>
 #include <com/sun/star/style/XAutoStyles.hpp>
 #include <com/sun/star/style/XAutoStyle.hpp>
@@ -64,9 +63,7 @@ typedef boost::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
 /******************************************************************************
  *
  ******************************************************************************/
-/*-----------------12.02.98 08:27-------------------
 
---------------------------------------------------*/
 class SwXStyleFamilies :  public cppu::WeakImplHelper4
 <
     ::com::sun::star::container::XIndexAccess,
@@ -88,7 +85,6 @@ protected:
 public:
     SwXStyleFamilies(SwDocShell& rDocShell);
 
-
     //XNameAccess
     virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -106,16 +102,12 @@ public:
     virtual void SAL_CALL loadStylesFromURL(const rtl::OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) throw( ::com::sun::star::uno::RuntimeException );
 
-
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
 };
 
-/* -----------------26.05.98 10:56-------------------
- *
- * --------------------------------------------------*/
 class SwXStyleFamily : public cppu::WeakImplHelper4
 <
     ::com::sun::star::container::XNameContainer,
@@ -125,9 +117,8 @@ class SwXStyleFamily : public cppu::WeakImplHelper4
 >,
     public SfxListener
 {
-    SfxStyleFamily              eFamily;        // Familie
+    SfxStyleFamily              eFamily;
     SfxStyleSheetBasePool*      pBasePool;
-//  const SfxItemPropertyMap*   _pPropMap;
     SwDocShell*                 pDocShell;
 
     SwXStyle*               _FindStyle(const String& rStyleName) const;
@@ -170,9 +161,7 @@ public:
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
 };
-/* -----------------20.05.98 09:51-------------------
- *
- * --------------------------------------------------*/
+
 class SwXStyle : public cppu::WeakImplHelper7
 <
     ::com::sun::star::style::XStyle,
@@ -190,7 +179,7 @@ class SwXStyle : public cppu::WeakImplHelper7
     SwDoc*                  m_pDoc;
     String                  sStyleName;
     SfxStyleSheetBasePool*  pBasePool;
-    SfxStyleFamily          eFamily;    // fuer Notify
+    SfxStyleFamily          eFamily;    // for Notify
 
     sal_Bool                    bIsDescriptor  : 1;
     sal_Bool                    bIsConditional : 1;
@@ -216,8 +205,8 @@ public:
     SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, BOOL bConditional = FALSE);
     SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam,
                                 SwDoc*  pDoc,
-                                const String& rStyleName);//,
-                                    //const SfxItemPropertyMap* _pMap);
+                                const String& rStyleName);
+
     ~SwXStyle();
 
     TYPEINFO();
@@ -247,7 +236,6 @@ public:
     virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
-//    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -261,7 +249,6 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertyStates
-    //virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -289,9 +276,7 @@ public:
     SwDoc*                GetDoc() const { return m_pDoc; }
     virtual void    Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
 };
-/* -----------------------------15.12.00 14:25--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwXFrameStyle : public SwXStyle,
                         public com::sun::star::document::XEventsSupplier
 {
@@ -313,9 +298,7 @@ public:
 
     friend class SwFrameStyleEventDescriptor;
 };
-/* -----------------24.08.98 16:04-------------------
- *
- * --------------------------------------------------*/
+
 class SwXPageStyle : public SwXStyle
 {
     SwDocShell*     pDocShell;
@@ -326,8 +309,7 @@ protected:
 
 public:
     SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam,
-                                const String& rStyleName);//,
-                                    //const SfxItemPropertyMap* _pMap);
+                                const String& rStyleName);
     SwXPageStyle(SwDocShell* pDocSh);
     ~SwXPageStyle();
 
@@ -338,9 +320,8 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
 
 };
-/*-- 19.05.2006 11:20:22---------------------------------------------------
-    access to all automatic style families
-  -----------------------------------------------------------------------*/
+
+// access to all automatic style families
 class SwXAutoStyles :
     public cppu::WeakImplHelper1< ::com::sun::star::style::XAutoStyles >,
     public SwUnoCollection
@@ -369,9 +350,8 @@ public:
     virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
 
 };
-/*-- 19.05.2006 11:20:12---------------------------------------------------
-    access to a family of automatic styles (character or paragraph or ...)
-  -----------------------------------------------------------------------*/
+
+// access to a family of automatic styles (character or paragraph or ...)
 class SwXAutoStyleFamily : public cppu::WeakImplHelper1< com::sun::star::style::XAutoStyleFamily >,
     public SwClient
 {
@@ -408,10 +388,8 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL nextElement(  ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 };
-/*-- 19.05.2006 11:20:02---------------------------------------------------
-    an automatic style
-  -----------------------------------------------------------------------*/
 
+// an automatic style
 class SwXAutoStyle : public cppu::WeakImplHelper3
 <
     ::com::sun::star::beans::XPropertySet,
@@ -441,7 +419,6 @@ public:
     virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
-    // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
@@ -455,7 +432,6 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertyStates
-    // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -465,5 +441,4 @@ public:
 };
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index fbf374b6d80b..f160e4e81910 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -42,7 +42,6 @@ class ViewShell;
 class SwDocShell;
 namespace svtools{ class ColorConfig;}
 
-//#define VIEWOPT_1_IDLE             0x00000001L  no longer used, see new member 'bIdle'
 #define VIEWOPT_1_TAB           0x00000002L
 #define VIEWOPT_1_BLANK         0x00000004L
 #define VIEWOPT_1_HARDBLANK     0x00000008L
@@ -54,8 +53,6 @@ namespace svtools{ class ColorConfig;}
 
 #define VIEWOPT_1_REF           0x00000400L
 #define VIEWOPT_1_FLDNAME       0x00000800L
-//#define           0x00001000L
-//#define      0x00002000L
 #define VIEWOPT_1_POSTITS       0x00004000L
 #define VIEWOPT_1_FLD_HIDDEN    0x00008000L
 #define VIEWOPT_1_CHAR_HIDDEN   0x00010000L
@@ -63,13 +60,11 @@ namespace svtools{ class ColorConfig;}
 #define VIEWOPT_1_TABLE         0x00040000L
 #define VIEWOPT_1_DRAW          0x00080000L
 #define VIEWOPT_1_CONTROL       0x00100000L
-//#define  0x00200000L
 #define VIEWOPT_1_CROSSHAIR     0x00400000L
 #define VIEWOPT_1_SNAP          0x00800000L
 #define VIEWOPT_1_SYNCHRONIZE   0x01000000L
 #define VIEWOPT_1_GRIDVISIBLE   0x02000000L
 #define VIEWOPT_1_ONLINESPELL   0x04000000L
-//#define VIEWOPT_1_HIDESPELL     0x08000000L   /* removed #i91949 */
 #define VIEWOPT_1_RESERVED1     0x10000000L
 #define VIEWOPT_1_VIEWMETACHARS 0x20000000L
 #define VIEWOPT_1_PAGEBACK      0x40000000L
@@ -159,9 +154,7 @@ protected:
     BOOL            bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents)
     BOOL            bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings
     BOOL            bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents
-    // --> FME 2004-06-29 #114856# Formular view
     BOOL            bFormView : 1;
-    // <--
     BOOL            bBookview : 1;      // view mode for page preview
     BOOL            mbViewLayoutBookMode : 1; // book view mode for edit view
     sal_Bool        bShowPlaceHolderFields : 1; //only used in printing!
@@ -390,11 +383,6 @@ public:
     inline void SetPrinting(BOOL b)
         { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);}
 
-/*---------------------------------------------------------------------------
-
-----------------------------------------------------------------------------*/
-
-
     inline short GetDivisionX() const   { return nDivisionX; }
     inline void  SetDivisionX( short n ){ nDivisionX = n; }
     inline short GetDivisionY() const   { return nDivisionY; }
@@ -410,17 +398,14 @@ public:
     BOOL         IsSelectionInReadonly() const {return bSelectionInReadonly;}
     void         SetSelectionInReadonly(BOOL bSet) {bSelectionInReadonly = bSet;}
 
-    // --> FME 2004-06-29 #114856# Formular view
     BOOL         IsFormView() const { return bFormView; }
     void         SetFormView( BOOL bSet ) { bFormView = bSet; }
-    // <--
 
     inline BOOL  IsPagePrevBookview() const { return bBookview; }
     inline void  SetPagePrevBookview(BOOL bSet) { bBookview = bSet; }
 
     BOOL IsAutoCompleteWords() const;
 
-    // PAGES01
     bool   IsViewLayoutBookMode() const { return mbViewLayoutBookMode; }
     void   SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; }
     USHORT GetViewLayoutColumns() const { return mnViewLayoutColumns; }