Bogus comments, commented lines removed, some german comments translated.

1 files changed, 13 insertions, 77 deletions

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 4811404a7517..47989c1d0d4b 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -46,7 +46,7 @@
 #endif
 #include <svl/itemset.hxx>
 
-#include <svx/svdundo.hxx> // #111827#
+#include <svx/svdundo.hxx>
 
 #include <numrule.hxx>
 #include <itabenum.hxx>
@@ -56,7 +56,6 @@
 #include <IMark.hxx>
 #include <IDocumentContentOperations.hxx>
 
-
 class SwUndoIter;
 class SwHistory;
 class SwIndex;
@@ -115,7 +114,6 @@ namespace utl {
     class TransliterationWrapper;
 }
 
-
 const String UNDO_ARG1("$1", RTL_TEXTENCODING_ASCII_US);
 const String UNDO_ARG2("$2", RTL_TEXTENCODING_ASCII_US);
 const String UNDO_ARG3("$3", RTL_TEXTENCODING_ASCII_US);
@@ -142,7 +140,6 @@ protected:
                                 const SwRedlineSaveDatas& rCheck,
                                 BOOL bCurrIsEnd );
 
-    // #111827#
     /**
        Returns the rewriter for this object.
 
@@ -159,7 +156,6 @@ public:
     virtual void Redo( SwUndoIter& ) = 0;
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns textual comment for this undo object.
 
@@ -240,7 +236,6 @@ public:
     ~SwUndoSaveCntnt();
 };
 
-
 // sicher eine vollstaendige Section im Nodes-Array
 class SwUndoSaveSection : private SwUndoSaveCntnt
 {
@@ -266,7 +261,6 @@ public:
           SwHistory* GetHistory()       { return pHistory; }
 };
 
-
 // Diese Klasse speichert den Pam als USHORT's und kann diese wieder zu
 // einem PaM zusammensetzen
 class SwUndRng
@@ -283,7 +277,6 @@ public:
     void SetPaM( SwUndoIter&, BOOL bCorrToCntnt = FALSE ) const;
 };
 
-
 class SwUndoStart: public SwUndo
 {
     // Um innerhalb von Undo zuerkennen, wann ein Start vorliegt, gibt
@@ -301,11 +294,9 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // -> #111827#
     virtual String GetComment() const;
     void SetRewriter(const SwRewriter & rRewriter);
     virtual SwRewriter GetRewriter() const;
-    // <- #111827#
 
     virtual SwUndoId GetEffectiveId() const;
     SwUndoId GetUserId() const { return nUserId; }
@@ -331,11 +322,9 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // -> #111827#
     virtual String GetComment() const;
     void SetRewriter(const SwRewriter & rRewriter);
     virtual SwRewriter GetRewriter() const;
-    // <- #111827#
 
     virtual SwUndoId GetEffectiveId() const;
     SwUndoId GetUserId() const { return nUserId; }
@@ -377,7 +366,6 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns rewriter for this undo object.
 
@@ -391,11 +379,9 @@ public:
      */
     virtual SwRewriter GetRewriter() const;
 
-
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoInsert)
 };
 
-
 class SwUndoDelete: public SwUndo, private SwUndRng, private SwUndoSaveCntnt
 {
     SwNodeIndex* pMvStt;            // Position der Nodes im UndoNodes-Array
@@ -431,7 +417,6 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns rewriter for this undo object.
 
@@ -449,7 +434,7 @@ public:
 
     void SetTblDelLastNd()      { bTblDelLastNd = TRUE; }
 
-    // fuer die PageDesc/PageBreak Attribute einer Tabelle
+    // for PageDesc/PageBreak Attribute of a table
     void SetPgBrkFlags( BOOL bPageBreak, BOOL bPageDesc )
         { bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; }
 
@@ -463,14 +448,13 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
 };
 
-
 class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt
 {
     String aDelStr, aInsStr;
     SwRedlineSaveDatas* pRedlSaveData;
     ULONG nSttNode;
     xub_StrLen nSttCntnt;
-    BOOL bInsChar : 1;      // kein Overwrite mehr; sondern Insert
+    BOOL bInsChar : 1;      // no more OverWrite; use Insert
     BOOL bGroup : 1;        // TRUE: ist schon eine Gruppe; wird in
                             //       CanGrouping() ausgwertet !!
 public:
@@ -480,7 +464,6 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns the rewriter of this undo object.
 
@@ -497,7 +480,6 @@ public:
     BOOL CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns );
 };
 
-
 class SwUndoSplitNode: public SwUndo
 {
     SwHistory* pHistory;
@@ -515,7 +497,6 @@ public:
     void SetTblFlag()       { bTblFlag = TRUE; }
 };
 
-
 class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
 {
     // nDest.. - Bereich, in den verschoben wurde (nach dem Move!)
@@ -552,7 +533,6 @@ public:
 
 };
 
-
 class SwUndoAttr : public SwUndo, private SwUndRng
 {
     SfxItemSet m_AttrSet;                           // attributes for Redo
@@ -607,7 +587,6 @@ class SwUndoFmtAttr : public SwUndo
 
     bool IsFmtInDoc( SwDoc* );   //is the attribute format still in the Doc?
     void SaveFlyAnchor( bool bSaveDrawPt = false );
-    // --> OD 2004-10-26 #i35443# - Add return value, type <bool>.
     // Return value indicates, if anchor attribute is restored.
     // Notes: - If anchor attribute is restored, all other existing attributes
     //          are also restored.
@@ -616,26 +595,22 @@ class SwUndoFmtAttr : public SwUndo
     //          aren't restored.
     //          This situation occurs for undo of styles.
     bool RestoreFlyAnchor( SwUndoIter& rIter );
-    // <--
-    // --> OD 2008-02-27 #refactorlists# - removed <rAffectedItemSet>
+
     void Init();
-    // <--
 
 public:
     // register at the Format and save old attributes
-    // --> OD 2008-02-27 #refactorlists# - removed <rNewSet>
     SwUndoFmtAttr( const SfxItemSet& rOldSet,
                    SwFmt& rFmt,
                    bool bSaveDrawPt = true );
-    // <--
     SwUndoFmtAttr( const SfxPoolItem& rItem,
                    SwFmt& rFmt,
                    bool bSaveDrawPt = true );
     virtual ~SwUndoFmtAttr();
     virtual void Undo( SwUndoIter& );
-    // --> OD 2004-10-26 #i35443# - <Redo(..)> calls <Undo(..)> - nothing else
+
     virtual void Redo( SwUndoIter& );
-    // <--
+
     virtual void Repeat( SwUndoIter& );
     virtual SwRewriter GetRewriter() const;
 
@@ -643,7 +618,6 @@ public:
     SwFmt* GetFmt( SwDoc& rDoc );   // checks if it is still in the Doc!
 };
 
-// --> OD 2008-02-12 #newlistlevelattrs#
 class SwUndoFmtResetAttr : public SwUndo
 {
     public:
@@ -662,7 +636,6 @@ class SwUndoFmtResetAttr : public SwUndo
         // old attribute which has been reset - needed for undo.
         ::std::auto_ptr<SfxPoolItem> m_pOldItem;
 };
-// <--
 
 class SwUndoDontExpandFmt : public SwUndo
 {
@@ -692,33 +665,27 @@ public:
     SwUndoFmtAttr* ReleaseUndo()    { return m_pUndo.release(); }
 };
 
-
 class SwUndoFmtColl : public SwUndo, private SwUndRng
 {
     String aFmtName;
     SwHistory* pHistory;
     SwFmtColl* pFmtColl;
-    // --> OD 2008-04-15 #refactorlists# - for correct <ReDo(..)> and <Repeat(..)>
     // boolean, which indicates that the attributes are reseted at the nodes
     // before the format has been applied.
     const bool mbReset;
     // boolean, which indicates that the list attributes had been reseted at
     // the nodes before the format has been applied.
     const bool mbResetListAttrs;
-    // <--
 public:
-    // --> OD 2008-04-15 #refactorlists#
-//    SwUndoFmtColl( const SwPaM&, SwFmtColl* );
+
     SwUndoFmtColl( const SwPaM&, SwFmtColl*,
                    const bool bReset,
                    const bool bResetListAttrs );
-    // <--
     virtual ~SwUndoFmtColl();
     virtual void Undo( SwUndoIter& );
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns the rewriter for this undo object.
 
@@ -738,7 +705,6 @@ public:
 
 };
 
-
 class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
 {
     const ::std::auto_ptr<SwHistory> m_pHistory;
@@ -932,7 +898,6 @@ public:
     void SaveSection( SwStartNode* pSttNd );
     void ReNewBoxes( const SwSelBoxes& rBoxes );
 
-
     void SetColWidthParam( ULONG nBoxIdx, USHORT nMode, USHORT nType,
                             SwTwips nAbsDif, SwTwips nRelDif )
     {
@@ -970,7 +935,6 @@ public:
 
 };
 
-
 class SwUndoTblNumFmt : public SwUndo
 {
     SfxItemSet *pBoxSet;
@@ -1073,7 +1037,6 @@ public:
     void SaveFormula( SwHistory& rHistory );
 };
 
-
 class SwUndoBookmark : public SwUndo
 {
     const ::std::auto_ptr<SwHistoryBookmark> m_pHistoryBookmark;
@@ -1087,7 +1050,6 @@ protected:
 public:
     virtual ~SwUndoBookmark();
 
-    // #111827#
     /**
        Returns the rewriter for this undo object.
 
@@ -1103,7 +1065,6 @@ public:
     virtual SwRewriter GetRewriter() const;
 };
 
-
 class SwUndoInsBookmark : public SwUndoBookmark
 {
 public:
@@ -1112,7 +1073,6 @@ public:
     virtual void Redo( SwUndoIter& );
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Undo auf Sorting
  --------------------------------------------------------------------*/
@@ -1170,8 +1130,6 @@ public:
 
 };
 
-
-
 //--------------------------------------------------------------------
 
 class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection
@@ -1231,7 +1189,6 @@ public:
 
 };
 
-
 class SwUndoSetFlyFmt : public SwUndo, public SwClient
 {
     SwFrmFmt* pFrmFmt;                  // das gespeicherte FlyFormat
@@ -1277,7 +1234,6 @@ public:
     virtual void Undo( SwUndoIter& );
     virtual void Redo( SwUndoIter& );
 
-    // #111827#
     /**
        Returns the rewriter of this undo object.
 
@@ -1307,10 +1263,8 @@ public:
 
 };
 
-
 //--------------------------------------------------------------------
 
-
 class SwUndoTblHeadline : public SwUndo
 {
     ULONG nTblNd;
@@ -1323,8 +1277,7 @@ public:
     virtual void Repeat( SwUndoIter& );
 };
 
-
-//------------ Undo von Insert-/Delete-Sections ----------------------
+//------------ Undo of Insert-/Delete-Sections ----------------------
 
 class SwUndoInsSection : public SwUndo, private SwUndRng
 {
@@ -1358,7 +1311,6 @@ SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const&);
 
 SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
 
-
 //------------ Undo von verschieben/stufen von Gliederung ----------------
 
 class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng
@@ -1387,7 +1339,7 @@ public:
 };
 
 //--------------------------------------------------------------------
-// ---------- Undo fuer Numerierung ----------------------------------
+// ---------- Undo for Numbering ----------------------------------
 
 class SwUndoInsNum : public SwUndo, private SwUndRng
 {
@@ -1485,7 +1437,7 @@ public:
 };
 
 //--------------------------------------------------------------------
-// ---------- Undo fuer DrawObjecte ----------------------------------
+// ---------- Undo for DrawObjecte ----------------------------------
 
 class SwSdrUndo : public SwUndo
 {
@@ -1516,7 +1468,6 @@ public:
     void SetGroupFmt( SwDrawFrmFmt* );
 };
 
-// --> OD 2006-11-01 #130889#
 // Action "ungroup drawing object" is now splitted into three parts - see
 // method <SwDoc::UnGroupSelection(..)>:
 // - creation for <SwDrawFrmFmt> instances for the group members of the
@@ -1543,7 +1494,6 @@ public:
     void AddObj( USHORT nPos, SwDrawFrmFmt* );
 };
 
-// --> OD 2006-11-01 #130889#
 class SwUndoDrawUnGroupConnectToLayout : public SwUndo
 {
     private:
@@ -1558,8 +1508,6 @@ class SwUndoDrawUnGroupConnectToLayout : public SwUndo
         void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
                            SdrObject* pDrawObject );
 };
-// <--
-
 
 class SwUndoDrawDelete : public SwUndo
 {
@@ -1603,24 +1551,21 @@ class SwUndoInsertLabel : public SwUndo
 {
     union {
         struct {
-            // fuer NoTxtFrms
+            // for NoTxtFrms
             SwUndoInsLayFmt* pUndoFly;
             SwUndoFmtAttr* pUndoAttr;
         } OBJECT;
         struct {
-            // fuer Tabelle/TextRahmen
+            // for Tables/TextBoxes
             SwUndoDelete* pUndoInsNd;
             ULONG nNode;
         } NODE;
     };
 
     String sText;
-    // --> PB 2005-01-06 #i39983# - the separator will be drawed with a character style
     String sSeparator;
-    // <--
     String sNumberSeparator;
     String sCharacterStyle;
-    // OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed
     USHORT nFldId;
     SwLabelType eType;
     BYTE nLayerId;              // fuer Zeichen-Objekte
@@ -1630,10 +1575,8 @@ class SwUndoInsertLabel : public SwUndo
 
 public:
     SwUndoInsertLabel( const SwLabelType eTyp, const String &rText,
-    // --> PB 2005-01-06 #i39983# - the separator will be drawed with a character style
                         const String& rSeparator,
-    // <--
-                        const String& rNumberSeparator, //#i61007# order of captions
+                        const String& rNumberSeparator, /
                         const BOOL bBefore, const USHORT nId,
                         const String& rCharacterStyle,
                         const BOOL bCpyBrd );
@@ -1643,7 +1586,6 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns the rewriter of this undo object.
 
@@ -1711,7 +1653,6 @@ public:
     virtual void Redo( SwUndoIter& );
 };
 
-
 //--------------------------------------------------------------------
 
 struct _UndoTransliterate_Data;
@@ -1824,7 +1765,6 @@ public:
     virtual void Redo( SwUndoIter& );
 };
 
-
 //--------------------------------------------------------------------
 
 // Object der als Iterator durch die Undo-Liste laeuft, bis die
@@ -1866,8 +1806,6 @@ public:
     void ClearSelections()  { pSelFmt = 0; pMarkList = 0; }
 };
 
-
-// -> #111827#
 const int nUndoStringLength = 20;
 
 /**
@@ -1894,9 +1832,7 @@ const int nUndoStringLength = 20;
    @return the shortened string
  */
 String ShortenString(const String & rStr, xub_StrLen nLength, const String & rFillStr);
-// <- #111827#
 
-// #16487#
 /**
    Denotes special characters in a string.