translate German comments in files (a-d) in sw/source/inc

10 files changed, 91 insertions, 161 deletions

diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index d8b4f3ae0ffa..8e86aa9df220 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -76,24 +76,22 @@ public:
 
     virtual sal_Bool SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const String& rURL );
 
-    // returne den Text eines vorherigen Absatzes.
-    // Dieser darf nicht leer sein!
-    // Gibt es diesen nicht oder gibt es davor nur Leere, dann returne 0
-    // Das Flag gibt an:
-    //      sal_True: den, vor der normalen Einfuegeposition (sal_True)
-    //      sal_False: den, in den das korrigierte Wort eingfuegt wurde.
-    //              (Muss nicht der gleiche Absatz sein!!!!)
+    // return text of a previous paragraph
+    // This must not be empty/blank!
+    // If it does not exist or if there is nothing before, return 0.
+    //  - sal_True:  paragraph before "normal" insertion position
+    //  - sal_False: paragraph in that the corrected word was inserted
+    //               (does not need to be the same paragraph)
     virtual const String* GetPrevPara( sal_Bool bAtNormalPos );
 
     virtual sal_Bool ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos,
                                   SvxAutoCorrect& rACorrect,
                                   const String** ppPara );
 
-    // wird nach dem austauschen der Zeichen von den Funktionen
-    //  - FnCptlSttWrd
-    //  - FnCptlSttSntnc
-    // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten
-    // aufgenommen werden.
+    // Will be called after swapping characters by the functions
+    //  - FnCptlSttWrd and
+    //  - FnCptlSttSntnc.
+    // Afterwards the words can be added into exception list if needed.
     virtual void SaveCpltSttWord( sal_uLong nFlag, xub_StrLen nPos,
                                     const String& rExceptWord, sal_Unicode cChar );
     virtual LanguageType GetLanguage( xub_StrLen nPos, sal_Bool bPrevPara ) const;
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 7fd2c91f720c..40054b624080 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -82,7 +82,7 @@ public:
     inline sal_Bool IsVisible() const { return bVisible ; }
 };
 
-// Blink-Manager, globale Variable, in Blink.Cxx angelegt
+// Blink-Manager, global variable, see Blink.Cxx
 extern SwBlink *pBlink;
 
 
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index d4d9b34252c5..a105d20863c4 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -38,15 +38,15 @@ class SwBorderAttrs;
 class SwAttrSetChg;
 class SwTxtFrm;
 
-//Implementiert in cntfrm.cxx, wird von cntfrm.cxx und crsrsh.cxx angezogen
+// implemented in cntfrm.cxx, used in cntfrm.cxx and crsrsh.cxx
 extern sal_Bool GetFrmInPage( const SwCntntFrm*, SwWhichPage, SwPosPage, SwPaM* );
 
 class SwCntntFrm: public SwFrm, public SwFlowFrm
 {
-    friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );    //ruft MakePrtArea
+    friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt );    // calls MakePrtArea
 
-    // parameter <bObjsInNewUpper>, indicating that objects are existing in
-    // remaining area of new upper
+    // parameter <bObjsInNewUpper>  indicates that objects exist in remaining
+    // area of new upper
     sal_Bool _WouldFit( SwTwips nSpace,
                     SwLayoutFrm *pNewUpper,
                     sal_Bool bTstMove,
@@ -73,7 +73,7 @@ protected:
 
 public:
     virtual ~SwCntntFrm();
-    TYPEINFO(); //bereits in Basisklassen drin
+    TYPEINFO(); // already in base class
 
     virtual void Cut();
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
@@ -88,7 +88,7 @@ public:
     inline       SwCntntFrm *GetPrecede();
     SwTxtFrm* FindMaster() const;
 
-        //Layoutabhaengiges Cursortravelling
+    // layout dependent cursor travelling
     virtual sal_Bool    LeftMargin( SwPaM * ) const;
     virtual sal_Bool    RightMargin( SwPaM *, sal_Bool bAPI = sal_False ) const;
     virtual sal_Bool    UnitUp( SwPaM *, const SwTwips nOffset = 0,
@@ -103,11 +103,11 @@ public:
     inline  sal_Bool    EndPrevPage( SwPaM * ) const;
 
     // nMaxHeight is the required height
-    // bSplit indicates, that the paragraph has to be split
-    // bTst indicates, that we are currently doing a test formatting
+    // bSplit indicates that the paragraph has to be split
+    // bTst indicates that we are currently doing a test formatting
     virtual sal_Bool WouldFit( SwTwips &nMaxHeight, sal_Bool &bSplit, sal_Bool bTst );
 
-    sal_Bool MoveFtnCntFwd( sal_Bool, SwFtnBossFrm* );//von MoveFwd gerufen bei Ftn-Inhalt
+    sal_Bool MoveFtnCntFwd( sal_Bool, SwFtnBossFrm* ); // called by MoveFwd if content
 
     inline  SwCntntFrm* GetNextCntntFrm() const;
     inline  SwCntntFrm* GetPrevCntntFrm() const;
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 9e3cf0dff55e..721404109ed2 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -40,9 +40,7 @@ const sal_uInt32 SWGInventor =  sal_uInt32('S')*0x00000001+
 const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001;
 const sal_uInt16 SwDrawFirst            = 0x0001;
 
-//---------------------------------------
-//SwFlyDrawObj, Die DrawObjekte fuer Flys.
-
+// DrawObjects for Flys
 class SwFlyDrawObj : public SdrObject
 {
 private:
@@ -59,18 +57,15 @@ public:
     SwFlyDrawObj();
     ~SwFlyDrawObj();
 
-    //Damit eine Instanz dieser Klasse beim laden erzeugt werden kann
-    //(per Factory).
+    // for instantiation of this class while loading (via factory)
     virtual sal_uInt32 GetObjInventor()     const;
     virtual sal_uInt16 GetObjIdentifier()   const;
     virtual sal_uInt16 GetObjVersion()      const;
 };
 
-//---------------------------------------
-//SwVirtFlyDrawObj, die virtuellen Objekte fuer Flys.
-//Flys werden immer mit virtuellen Objekten angezeigt. Nur so koennen sie
-//ggf. mehrfach angezeigt werden (Kopf-/Fusszeilen).
-
+// virtual objects for Flys
+// Flys will always be shown with virtual objects. By doing that, they can be
+// shown multiple times if needed (header/footer).
 class SwVirtFlyDrawObj : public SdrVirtObj
 {
 private:
@@ -96,10 +91,10 @@ public:
     SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly);
     ~SwVirtFlyDrawObj();
 
-    //Ueberladene Methoden der Basisklasse SdrVirtObj
+    // overloaded method of base class SdrVirtObj
     virtual void     TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const;
 
-    //Wir nehemen die Groessenbehandlung vollstaendig selbst in die Hand.
+    // we treat the size calculation completely on ourself here
     virtual const Rectangle& GetCurrentBoundRect() const;
     virtual const Rectangle& GetLastBoundRect() const;
     virtual       void       RecalcBoundRect();
@@ -121,13 +116,13 @@ public:
     const SwFrmFmt *GetFmt() const;
           SwFrmFmt *GetFmt();
 
-    // Get Methoden fuer die Fly Verpointerung
+    // methods to get pointers for the Fly
           SwFlyFrm* GetFlyFrm()         { return pFlyFrm; }
     const SwFlyFrm* GetFlyFrm() const   { return pFlyFrm; }
 
     void SetRect() const;
 
-    // ist eine URL an einer Grafik gesetzt, dann ist das ein Makro-Object
+    // if an URL is attached to a graphic than this is a macro object
     virtual bool       HasMacro() const;
     virtual SdrObject* CheckMacroHit       (const SdrObjMacroHitRec& rRec) const;
     virtual Pointer    GetMacroPointer     (const SdrObjMacroHitRec& rRec) const;
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 30410b71af44..40f1e78394ef 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -45,7 +45,7 @@ class SwDoc;
 class SwNode;
 struct SwPosition;
 
-// Update an den Expression Feldern
+// Update expression fields
 class _SetGetExpFld
 {
     sal_uLong nNode;
@@ -120,8 +120,7 @@ public:
 typedef _SetGetExpFld* _SetGetExpFldPtr;
 SV_DECL_PTRARR_SORT_DEL( _SetGetExpFlds, _SetGetExpFldPtr, 0 )
 
-
-// Struktur zum Speichern der Strings aus SetExp-String-Feldern
+// struct for saving strings from the SetExp's string fields
 struct _HashStr : public SwHash
 {
     String aSetStr;
@@ -137,32 +136,28 @@ struct SwCalcFldType : public SwHash
     {}
 };
 
-// Suche nach dem String, der unter dem Namen in der HashTabelle abgelegt
-// wurde
+// search for the string that was saved under rName in the hash table
 void LookString( SwHash** ppTbl, sal_uInt16 nSize, const String& rName,
                     String& rRet, sal_uInt16* pPos = 0 );
 
-
-// --------
-
-const int GETFLD_ALL        = 3;        // veroderte Flags !!
+const int GETFLD_ALL        = 3;        // combine flags via OR
 const int GETFLD_CALC       = 1;
 const int GETFLD_EXPAND     = 2;
 
 class SwDocUpdtFld
 {
-    _SetGetExpFlds* pFldSortLst;    // akt. Field-Liste zum Calculieren
+    _SetGetExpFlds* pFldSortLst;    // current field list for calculation
     SwCalcFldType*  aFldTypeTable[ TBLSZ ];
 
-// noch eine weitere Optimierung - wird z.Z. nicht angesprochen!
-    long nFldUpdtPos;               // ab dieser Position mit Update starten
-    SwCntntNode* pCNode;            // der TxtNode zur UpdatePos.
+    // another optimization - currently not used!
+    long nFldUpdtPos;               // start update from this position
+    SwCntntNode* pCNode;            // TxtNode at update position
 
-    sal_uLong nNodes;                   // sollte die NodesAnzahl unterschiedlich sein
+    sal_uLong nNodes;               // if the node count is different
     sal_uInt8 nFldLstGetMode;
 
-    sal_Bool bInUpdateFlds : 1;         // zur Zeit laeuft ein UpdateFlds,
-    sal_Bool bFldsDirty : 1;            // irgendwelche Felder sind ungueltig
+    sal_Bool bInUpdateFlds : 1;     // currently there is an UpdateFlds
+    sal_Bool bFldsDirty : 1;        // some fields are invalid
 
     void _MakeFldList( SwDoc& pDoc, int eGetMode );
     void GetBodyNode( const SwTxtFld& , sal_uInt16 nFldWhich );
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index f91be1ff25b6..0a6966d4e75f 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -45,14 +45,11 @@ class _FndLine;
 class CollatorWrapper;
 class LocaleDataWrapper;
 
-
 namespace com { namespace sun { namespace star { namespace lang {
     struct Locale;
 }}}}
 
-/*--------------------------------------------------------------------
-    Beschreibung: Liste aller sortierten Elemente
- --------------------------------------------------------------------*/
+// List of all sorted elements
 typedef const _FndBox*      _FndBoxPtr;
 typedef SwSortElement*      SwSortElementPtr;
 
@@ -64,11 +61,7 @@ public:
     sal_uInt16 GetPos(const SwTableBox* pTableBox) const;
 };
 
-
-/*--------------------------------------------------------------------
-    Beschreibung: Funktionen zum Moven von Boxen
- --------------------------------------------------------------------*/
-
+// Functions for moving boxes
 void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox,
              sal_uInt16 nS, sal_uInt16 nT, SwMovedBoxes& rMovedList, SwUndoSort* pUD=0);
 void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox,
@@ -76,10 +69,7 @@ void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox,
 void MoveCell(SwDoc* pDoc, const SwTableBox* pSource,
               const SwTableBox* pTar, sal_Bool bMovedBefore, SwUndoSort* pUD=0);
 
-/*-------------------------------------------------------------------
-    Beschreibung: Elemente zum Sortieren von Text und Tabellen-Inhalt
- --------------------------------------------------------------------*/
-
+// Elements for sorting text and table content
 struct SwSortElement
 {
     static SwSortOptions*       pOptions;
@@ -104,10 +94,7 @@ struct SwSortElement
     double StrToDouble(const String& rStr) const;
 };
 
-/*--------------------------------------------------------------------
-    Beschreibung: Sortieren Text
- --------------------------------------------------------------------*/
-
+// sort text
 struct SwSortTxtElement : public SwSortElement
 {
     // fuer Text
@@ -120,10 +107,7 @@ struct SwSortTxtElement : public SwSortElement
     virtual String GetKey( sal_uInt16 nKey ) const;
 };
 
-/*--------------------------------------------------------------------
-    Beschreibung: Sortieren Tabelle
- --------------------------------------------------------------------*/
-
+// sort table
 struct SwSortBoxElement : public SwSortElement
 {
     sal_uInt16                      nRow;
@@ -135,12 +119,7 @@ struct SwSortBoxElement : public SwSortElement
     virtual double GetValue( sal_uInt16 nKey ) const;
 };
 
-
-/*--------------------------------------------------------------------
-    Beschreibung: SymFndBoxes stellt ein zweidimensionales
-                  Array von FndBoxes dar
- --------------------------------------------------------------------*/
-
+// two-dimensional array of FndBoxes
 class FlatFndBox
 {
 public:
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 0308de76dd8a..0c2b6a575551 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -43,10 +43,6 @@ struct SwTOXSortTabBase;
 
 typedef std::vector<SwTOXSortTabBase*> SwTOXSortTabBases;
 
-/*--------------------------------------------------------------------
-     Beschreibung: Ring der speziellen Verzeichnisse
- --------------------------------------------------------------------*/
-
 class SwTOXBaseSection : public SwTOXBase, public SwSection
 {
     SwTOXSortTabBases aSortArr;
@@ -62,45 +58,43 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection
     void    UpdateAuthorities( const SwTOXInternational& rIntl );
     void    UpdateAll();
 
-    // Sortiert einfuegen ins Array fuer die Generierung
+    // insert sorted into array for creation
     void    InsertSorted(SwTOXSortTabBase* pBase);
 
-    // Alpha-Trennzeichen bei der Generierung einfuegen
+    // insert alpha delimiter at creation
     void    InsertAlphaDelimitter( const SwTOXInternational& rIntl );
 
-    // Textrumpf generieren
-    // add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc>
+    // generate text body
     void GenerateText( sal_uInt16 nArrayIdx,
                        sal_uInt16 nCount,
                        const sal_uInt32   _nTOXSectNdIdx,
                        const SwPageDesc*  _pDefaultPageDesc );
 
-    // Seitennummerplatzhalter gegen aktuelle Nummern austauschen
+    // replace page num placeholder with actual page number
     void    _UpdatePageNum( SwTxtNode* pNd,
                             const std::vector<sal_uInt16>& rNums,
                             const SvPtrarr &rDescs,
                             const std::vector<sal_uInt16>* pMainEntryNums,
                             const SwTOXInternational& rIntl );
 
-    // Bereich fuer Stichwort einfuegen suchen
+    // get section for entering keywords
     Range GetKeyRange( const String& rStr, const String& rStrReading,
                        const SwTOXSortTabBase& rNew, sal_uInt16 nLevel,
                        const Range& rRange );
 
-    // returne die TextCollection ueber den Namen / aus Format-Pool
+    // return text collection via name/ from format pool
     SwTxtFmtColl* GetTxtFmtColl( sal_uInt16 nLevel );
 
 public:
     SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt);
     virtual ~SwTOXBaseSection();
 
-    // add parameter <_bNewTOX> in order to distinguish
-    // between the creation of a new table-of-content or an update of
-    // a table-of-content. Default value: false
+    // <_bNewTOX> : distinguish between the creation of a new table-of-content
+    //              (true) or an update of a table-of-content (false)
     void Update( const SfxItemSet* pAttr = 0,
-                 const bool        _bNewTOX = false ); // Formatieren
-    void UpdatePageNum();               // Seitennummern einfuegen
-    TYPEINFO();                         // fuers rtti
+                 const bool        _bNewTOX = false );
+    void UpdatePageNum();               // insert page numbering
+    TYPEINFO();                         // for rtti
 
     sal_Bool SetPosAtStartEnd( SwPosition& rPos, sal_Bool bAtStart = sal_True ) const;
 };
diff --git a/sw/source/core/inc/drawdev.hxx b/sw/source/core/inc/drawdev.hxx
index 31d630a741e4..319d6a8c379a 100644
--- a/sw/source/core/inc/drawdev.hxx
+++ b/sw/source/core/inc/drawdev.hxx
@@ -30,15 +30,9 @@
 #define _DRAWDEV_HXX
 
 #include "swrect.hxx"
-
 #include <vcl/outdev.hxx>
 
-/*************************************************************************
- *                          class SwDrawDev
- *
- * Alle Draw-Methoden werden um den Offset *pPos verschoben.
- *************************************************************************/
-
+// all draw methods will be moved by offset *pPos
 class SwDrawDev
 {
     OutputDevice  *pOut;
@@ -50,7 +44,7 @@ public:
 
     inline OutputDevice *GetOut() { return pOut; }
 
-    // Ausgabemethoden
+    // output methods
     inline void DrawText( const Point& rStart, const String& rTxt,
                           const sal_uInt16 nIdx = 0,
                           const sal_uInt16 nLen = STRING_LEN );
@@ -71,10 +65,7 @@ public:
     inline const Point *GetOrigin() const {return pPos; }
 };
 
-/*************************************************************************
- *                      SwDrawDev::DrawText
- *************************************************************************/
-
+// implementation
 inline void SwDrawDev::DrawText( const Point& rStart, const String& rTxt,
                                  const sal_uInt16 nIdx, const sal_uInt16 nLen )
 {
@@ -84,10 +75,6 @@ inline void SwDrawDev::DrawText( const Point& rStart, const String& rTxt,
         pOut->DrawText( rStart - *pPos, rTxt, nIdx, nLen );
 }
 
-/*************************************************************************
- *                      SwDrawDev::DrawStretchText
- *************************************************************************/
-
 inline void SwDrawDev::DrawStretchText( const Point& rStart, sal_uInt16 nWidth,
        const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen )
 {
@@ -97,10 +84,6 @@ inline void SwDrawDev::DrawStretchText( const Point& rStart, sal_uInt16 nWidth,
         pOut->DrawStretchText( rStart - *pPos, nWidth, rTxt, nIdx, nLen );
 }
 
-/*************************************************************************
- *                      SwDrawDev::DrawTextArray
- *************************************************************************/
-
 inline void SwDrawDev::DrawTextArray( const Point& rStart, const String& rTxt,
             long *pKernArray, const sal_uInt16 nIdx, const sal_uInt16 nLen )
 {
@@ -110,10 +93,6 @@ inline void SwDrawDev::DrawTextArray( const Point& rStart, const String& rTxt,
         pOut->DrawTextArray( rStart - *pPos, rTxt, pKernArray, nIdx, nLen );
 }
 
-/*************************************************************************
- *                      SwDrawDev::DrawLine
- *************************************************************************/
-
 inline void SwDrawDev::DrawLine( const Point& rStart, const Point& rEnd )
 {
     if( !pPos )
@@ -122,10 +101,6 @@ inline void SwDrawDev::DrawLine( const Point& rStart, const Point& rEnd )
         pOut->DrawLine( rStart - *pPos, rEnd - *pPos );
 }
 
-/*************************************************************************
- *                      SwDrawDev::DrawRect
- *************************************************************************/
-
 inline void SwDrawDev::DrawRect( const SwRect& rRect,
                       const sal_uInt16 nHorzRound, const sal_uInt16 nVertRound )
 {
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 7fe39f4b0c9f..c74dfa9e322f 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -42,12 +42,7 @@ class SwFont;
 class Font;
 class SwUnderlineFont;
 
-/*************************************************************************
- *                      class SwDrawTextInfo
- *
- * encapsulates information for drawing text
- *************************************************************************/
-
+// encapsulates information for drawing text
 class SwDrawTextInfo
 {
     const SwTxtFrm* pFrm;
@@ -58,7 +53,7 @@ class SwDrawTextInfo
     const XubString* pText;
     const SwWrongList* pWrong;
     const SwWrongList* pGrammarCheck;
-    const SwWrongList* pSmartTags; // SMARTTAGS
+    const SwWrongList* pSmartTags;
     const Size* pSize;
     SwFont *pFnt;
     SwUnderlineFont* pUnderFnt;
@@ -78,26 +73,28 @@ class SwDrawTextInfo
     xub_StrLen nNumberOfBlanks;
     sal_uInt8 nCursorBidiLevel;
     sal_Bool bBullet : 1;
-    sal_Bool bUpper : 1;        // Fuer Kapitaelchen: Grossbuchstaben-Flag
-    sal_Bool bDrawSpace : 1;    // Fuer Kapitaelchen: Unter/Durchstreichung
-    sal_Bool bGreyWave  : 1;    // Graue Wellenlinie beim extended TextInput
-    sal_Bool bSpaceStop : 1;    // For underlining we need to know, if a portion
-                            // is right in front of a hole portion or a
-                            // fix margin portion.
+    sal_Bool bUpper : 1;        // for small caps: upper case flag
+    sal_Bool bDrawSpace : 1;    // for small caps: underline/ line through
+    sal_Bool bGreyWave  : 1;    // grey wave line for extended text input
+    // For underlining we need to know, if a section is right in front of a
+    // whole block or a fix margin section.
+    sal_Bool bSpaceStop : 1;
     sal_Bool bSnapToGrid : 1;   // Does paragraph snap to grid?
-    sal_Bool bIgnoreFrmRTL : 1; // Paint text as if text has LTR direction, used for
-                            // line numbering
-    sal_Bool bPosMatchesBounds :1;  // GetCrsrOfst should not return the next
-                                // position if screen position is inside second
-                                // half of bound rect, used for Accessibility
+    // Paint text as if text has LTR direction, used for line numbering
+    sal_Bool bIgnoreFrmRTL : 1;
+    // GetCrsrOfst should not return the next position if screen position is
+    // inside second half of bound rect, used for Accessibility
+    sal_Bool bPosMatchesBounds :1;
 
-    SwDrawTextInfo();       // nicht zulaessig
+    SwDrawTextInfo();          // prohibited
 public:
 
 #ifdef DBG_UTIL
-    bool m_bPos   : 1;    // These flags should control that the appropriate
-    bool m_bWrong : 1;    // Set-function has been called before calling
-    bool m_bGrammarCheck : 1;     //  the Get-function of a member
+    // These flags should control that the appropriate Set-function has been
+    // called before calling the Get-function of a member
+    bool m_bPos   : 1;
+    bool m_bWrong : 1;
+    bool m_bGrammarCheck : 1;
     bool m_bSize  : 1;
     bool m_bFnt   : 1;
     bool m_bHyph  : 1;
@@ -137,9 +134,8 @@ public:
         bIgnoreFrmRTL = sal_False;
         bPosMatchesBounds = sal_False;
 
-        // These values are initialized but, they have to be
-        // set explicitly via their Set-function before they may
-        // be accessed by their Get-function:
+        // These values are initialized but have to be set explicitly via their
+        // Set-function before they may be accessed by their Get-function:
         pPos = 0;
         pWrong = 0;
         pGrammarCheck = 0;
@@ -158,9 +154,9 @@ public:
         bDrawSpace = sal_False;
 
 #ifdef DBG_UTIL
-        // these flags control, whether the matching member variables have
-        // been set by using the Set-function before they may be accessed
-        // by their Get-function:
+        // these flags control whether the matching member variables have been
+        // set by using the Set-function before they may be accessed by their
+        // Get-function:
         m_bPos = m_bWrong = m_bGrammarCheck = m_bSize = m_bFnt = m_bAscent =
         m_bSpace = m_bNumberOfBlanks = m_bUppr =
         m_bDrawSp = m_bLeft = m_bRight = m_bKana = m_bOfst = m_bHyph =
@@ -618,10 +614,9 @@ public:
 
     void Shift( sal_uInt16 nDir );
 
-    // sets a new color at the output device if necessary
-    // if a font is passed as argument, the change if made to the font
-    // otherwise the font at the output device is changed
-    // returns if the font has been changed
+    // sets a new color at the output device if necessary if a font is passed
+    // as argument, the change if made to the font otherwise the font at the
+    // output device is changed returns if the font has been changed
     sal_Bool ApplyAutoColor( Font* pFnt = 0 );
 };
 
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index b90f70e5b23c..7155a47080da 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -39,9 +39,8 @@ class SwAnchoredObject;
 
 class SwDrawView : public FmFormView
 {
-    //Fuer den Anker
-    Point           aAnchorPoint;       //Ankerposition
-    SwViewImp      &rImp;               //Die View gehoert immer zu einer Shell
+    Point           aAnchorPoint;       // anchor position
+    SwViewImp      &rImp;               // a view is always part of a shell
 
     const SwFrm *CalcAnchor();
 
@@ -88,7 +87,7 @@ protected:
 public:
     SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice* pOutDev=NULL );
 
-    //aus der Basisklasse
+    // from base class
     virtual SdrObject*   GetMaxToTopObj(SdrObject* pObj) const;
     virtual SdrObject*   GetMaxToBtmObj(SdrObject* pObj) const;
     virtual void         MarkListHasChanged();
@@ -106,7 +105,7 @@ public:
     const SwViewImp &Imp() const { return rImp; }
           SwViewImp &Imp()       { return rImp; }
 
-    //Anker und Xor fuer das Draggen.
+    // anchor and Xor for dragging
     void ShowDragAnchor();
 
     virtual void DeleteMarked();