fdo#39468: Translate German comments in sw/source/core/

Change-Id: Ib48b281feccd4684571768ca2be6ecca23afbf55

17 files changed, 74 insertions, 80 deletions

diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index bd64283610f1..d03730a45bae 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -586,7 +586,7 @@ SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument)
 
 OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
 {
-    OSL_ENSURE( nFmt < FF_END, "Expand: kein guelt. Fmt!" );
+    OSL_ENSURE( nFmt < FF_END, "Expand: no valid Fmt!" );
 
     OUString aRet;
     SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -604,7 +604,7 @@ OUString SwTemplNameFieldType::Expand(sal_uLong nFmt) const
         {
             if( FF_UI_RANGE == nFmt )
             {
-                // fuers besorgen vom RegionNamen !!
+                // for getting region names!
                 SfxDocumentTemplates aFac;
                 aFac.Construct();
                 OUString sTmp;
@@ -747,7 +747,7 @@ OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
                 nFmt = (sal_uInt32)nNumberingType;
             break;
         default:
-            OSL_FAIL( "SwDocStatFieldType::Expand: unbekannter SubType" );
+            OSL_FAIL( "SwDocStatFieldType::Expand: unknown SubType" );
     }
 
     if( nVal <= SHRT_MAX )
@@ -879,7 +879,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
     OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
 
     sal_uInt16 nExtSub = nSub & 0xff00;
-    nSub &= 0xff;   // ExtendedSubTypes nicht beachten
+    nSub &= 0xff;   // do not consider extended SubTypes
 
     OUString aStr;
     switch(nSub)
@@ -1346,7 +1346,7 @@ OUString SwHiddenTxtField::Expand() const
 /// get current field value and cache it
 void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
 {
-    OSL_ENSURE(pDoc, "Wo ist das Dokument Seniore");
+    OSL_ENSURE(pDoc, "got no document");
 
     if( TYP_CONDTXTFLD == nSubType )
     {
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 45262262dd52..0d2afb79ddcb 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -142,7 +142,7 @@ SwTxtNode* GetFirstTxtNode( const SwDoc& rDoc, SwPosition& rPos,
         while( 0 != (pCNd = rNodes.GoNext( &rPos.nNode ) ) &&
                 0 == ( pTxtNode = pCNd->GetTxtNode() ) )
                         ;
-        OSL_ENSURE( pTxtNode, "Where is the 1.TextNode" );
+        OSL_ENSURE( pTxtNode, "Where is the 1. TextNode?" );
         rPos.nContent.Assign( pTxtNode, 0 );
     }
     else if ( !pCFrm->IsValid() )
@@ -169,9 +169,9 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
     {
         if( pLayout->IsFlyFrm() )
         {
-            // hole das FlyFormat
+            // get the FlyFormat
             SwFrmFmt* pFlyFmt = ((SwFlyFrm*)pLayout)->GetFmt();
-            OSL_ENSURE( pFlyFmt, "kein FlyFormat gefunden, wo steht das Feld" );
+            OSL_ENSURE( pFlyFmt, "Could not find FlyFormat, where is the field?" );
 
             const SwFmtAnchor &rAnchor = pFlyFmt->GetAnchor();
 
@@ -243,7 +243,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
             else
             {
                 Point aPt( pLayout->Frm().Pos() );
-                aPt.Y()++;      // aus dem Header raus
+                aPt.Y()++;      // get out of the header
                 pCntFrm = pPgFrm->GetCntntPos( aPt, false, true, false );
                 pTxtNode = GetFirstTxtNode( rDoc, rPos, pCntFrm, aPt );
             }
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 18b85c50c0ed..c62db3d913c0 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -357,8 +357,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
 
             case REF_BOOKMARK:
                 nStart = nNumStart;
-                // Text steht ueber verschiedene Nodes verteilt.
-                // Gesamten Text oder nur bis zum Ende vom Node?
+                // text is spread across multiple nodes - get whole text or only until end of node?
                 nEnd = nNumEnd<0 ? nLen : nNumEnd;
                 break;
 
@@ -369,7 +368,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
 
             case REF_FOOTNOTE:
             case REF_ENDNOTE:
-                // die Nummer oder den NumString besorgen
+                // get number or numString
                 for( unsigned i = 0; i < pDoc->GetFtnIdxs().size(); ++i )
                 {
                     SwTxtFtn* const pFtnIdx = pDoc->GetFtnIdxs()[i];
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index f3cd126ba531..60658bf973c3 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3073,12 +3073,12 @@ bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
 }
 
 /// provides the area of a frame in that no Fly from another area can overlap
-const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp )
+const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalContextType )
 {
     const sal_uInt16 nTyp = FRM_ROOT | FRM_HEADER   | FRM_FOOTER | FRM_FTNCONT  |
                         FRM_FTN  | FRM_FLY      |
                         FRM_TAB  | FRM_ROW      | FRM_CELL |
-                        nAdditionalKontextTyp;
+                        nAdditionalContextType;
     do
     {   if ( pFrm->GetType() & nTyp )
             break;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 3d520784b9ca..558582cead9a 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2559,15 +2559,15 @@ bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
 
         if (pNewBox)    // set new position (cell range) to use
         {
-            // So erh lt man den ersten Inhaltsnode in einer gegebenen Zelle:
-            // Zun chst einen SwNodeIndex auf den Node hinter dem SwStartNode der Box...
+            // This is how you get the first content node of a row:
+            // First get a SwNodeIndex pointing to the node after SwStartNode of the box...
             SwNodeIndex aIdx( *pNewBox->GetSttNd(), +1 );
-            // Dies kann ein SwCntntNode sein, kann aber auch ein Tabellen oder Sectionnode sein,
-            // deshalb das GoNext;
+            // This can be a SwCntntNode, but might also be a table or section node,
+            // therefore call GoNext
             SwCntntNode *pCNd = aIdx.GetNode().GetCntntNode();
             if (!pCNd)
                 pCNd = GetFrmFmt()->GetDoc()->GetNodes().GoNext( &aIdx );
-            //und damit kann man z.B. eine SwPosition erzeugen:
+            // and then one can e.g. create a SwPosition:
             SwPosition aNewPos( *pCNd );   // new position to beused with cursor
 
             // if the mark is to be changed make sure there is one...
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index c6a351d32e4b..7bba79726187 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1547,7 +1547,7 @@ sal_Bool SwXTextSections::hasByName(const OUString& rName)
     }
     else
     {
-        //Sonderbehandlung der dbg_ - Methoden
+        // special handling for dbg_ methods
         if( !rName.startsWith("dbg_"))
             throw uno::RuntimeException();
     }
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 473aa361e8f3..e1e89f9f4aca 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -297,7 +297,7 @@ uno::Reference< uno::XInterface >   SwFmDrawPage::GetInterface( SdrObject* pObj
 SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape )
     throw (uno::RuntimeException, std::exception)
 {
-    //TODO: stimmt das so - kann die Methode weg?
+    //FIXME: just a redirect call - can this method be deleted?
     return SvxFmDrawPage::_CreateSdrObject( xShape );
 }
 
@@ -604,11 +604,11 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
 
     uno::Reference< uno::XAggregation >     xAgg = pShape->GetAggregationInterface();
 
-    OSL_ENSURE(pSvxShape, "warum gibt es hier kein SvxShape?");
-    //diese Position ist auf jeden Fall in 1/100 mm
+    OSL_ENSURE(pSvxShape, "Why is here no SvxShape?");
+    // this position is definitely in 1/100 mm
     awt::Point aMM100Pos(pSvxShape->getPosition());
 
-    //jetzt noch die Properties aus dem SwShapeDescriptor_Impl auswerten
+    // now evaluate the properties of SwShapeDescriptor_Impl
     SwShapeDescriptor_Impl* pDesc = pShape->GetDescImpl();
 
     SfxItemSet aSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -619,7 +619,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     {
         if(pDesc->GetSurround())
             aSet.Put( *pDesc->GetSurround());
-        //die Items sind schon in Twip gesetzt
+        // all items are already in Twip
         if(pDesc->GetLRSpace())
         {
             aSet.Put(*pDesc->GetLRSpace());
@@ -755,9 +755,9 @@ uno::Reference< drawing::XShapeGroup >  SwXDrawPage::group(const uno::Reference<
     {
 
         SwFmDrawPage* pPage = GetSvxPage();
-        if(pPage)//kann das auch Null sein?
+        if(pPage) //TODO: can this be Null?
         {
-            //markieren und MarkList zurueckgeben
+            // mark and return MarkList
             const SdrMarkList& rMarkList = pPage->PreGroup(xShapes);
             if ( rMarkList.GetMarkCount() > 1 )
             {
@@ -807,7 +807,7 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG
     if(xPageAgg.is())
     {
         SwFmDrawPage* pPage = GetSvxPage();
-        if(pPage)//kann das auch Null sein?
+        if(pPage) //TODO: can this be Null?
         {
             pPage->PreUnGroup(xShapeGroup);
             UnoActionContext aContext(pDoc);
@@ -1075,7 +1075,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
         {
             if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
                 throw beans::PropertyVetoException ("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
-            //mit Layout kann der Anker umgesetzt werden, ohne dass sich die Position aendert
+            // with the layout it is possible to move the anchor without changing the position
             if(pFmt)
             {
                 SwAttrSet aSet(pFmt->GetAttrSet());
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index a27eadd7dc27..4f5425e4d1c8 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -850,7 +850,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
         }
         else
         {
-            //TODO: Properties fuer die uebrigen Feldtypen einbauen
+            //TODO: add properties for the other field types
             const sal_uInt16 nMId = GetFieldTypeMId( rPropertyName, *pType );
             if (USHRT_MAX == nMId)
             {
@@ -979,7 +979,7 @@ throw (uno::RuntimeException, std::exception)
             nTypeIdx = i;
     }
 
-    // zuerst alle Felder loeschen
+    // first delete all fields
     SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
     SwFmtFld* pFld = aIter.First();
     while(pFld)
@@ -991,7 +991,7 @@ throw (uno::RuntimeException, std::exception)
         }
         pFld = aIter.Next();
     }
-    // dann den FieldType loeschen
+    // then delete FieldType
     m_pImpl->m_pDoc->RemoveFldType(nTypeIdx);
 }
 
@@ -1311,12 +1311,12 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     }
 
     SwDoc* pDoc = pRange ? (SwDoc*)pRange->GetDoc() : pCursor ? (SwDoc*)pCursor->GetDoc() : 0;
-    //wurde ein FieldMaster attached, dann ist das Dokument schon festgelegt!
+    // if a FieldMaster was attached, then the document is already fixed!
     if (!pDoc || (m_pImpl->m_pDoc && m_pImpl->m_pDoc != pDoc))
         throw lang::IllegalArgumentException();
 
     SwUnoInternalPaM aPam(*pDoc);
-    //das muss jetzt sal_True liefern
+    // this now needs to return TRUE
     ::sw::XTextRangeToSwPaM(aPam, xTextRange);
     SwField* pFld = 0;
     switch (m_pImpl->m_nServiceId)
@@ -1768,7 +1768,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
                     m_pImpl->m_pProps->sPar1, nSubType,
                     m_pImpl->m_pProps->nFormat);
             pFld = pGEField;
-            //TODO: SubType auswerten!
+            //TODO: evaluate SubType!
             if (!m_pImpl->m_pProps->sPar4.isEmpty())
                 pGEField->ChgExpStr(m_pImpl->m_pProps->sPar4);
             // #i82544#
@@ -1929,9 +1929,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         else
             pDoc->InsertPoolItem(aPam, aFmt, nInsertFlags);
 
-        SwTxtAttr* pTxtAttr = aPam.GetNode().GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
+        SwTxtAttr* pTxtAttr = aPam.GetNode()->GetTxtNode()->GetFldTxtAttrAt( aPam.GetPoint()->nContent.GetIndex()-1, true );
 
-        // was passiert mit dem Update der Felder ? (siehe fldmgr.cxx)
+        // What about updating the fields? (see fldmgr.cxx)
         if (pTxtAttr)
         {
             const SwFmtFld& rFld = pTxtAttr->GetFmtFld();
@@ -2085,7 +2085,7 @@ SwXTextField::getPropertySetInfo()
 throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    //kein static
+    // no static
     uno::Reference< beans::XPropertySetInfo >  aRef;
     if (m_pImpl->m_nServiceId == USHRT_MAX)
     {
@@ -2342,11 +2342,9 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                                         nHiddenStart, nHiddenEnd );
                     }
 
-                    // !bFrame && !bHidden: aller Wahrscheinlichkeit handelt es
-                    // sich um ein Feld in einem unbenutzten Seitenstyle
+                    // !bFrame && !bHidden: most probably a field in an unused page style
 
-                    // bHidden: Feld ist versteckt
-                    // FME: Problem: Verstecktes Feld in unbenutzter Seitenvorlage =>
+                    // FME: Problem: hidden field in unused page template =>
                     // bIsFieldUsed = true
                     // bIsFieldDisplayed = false
                     bIsFieldUsed       = bFrame || bHidden;
@@ -2594,7 +2592,7 @@ void SwXTextField::Impl::Modify(
         break;
 
     case RES_FMT_CHG:
-        // wurden wir an das neue umgehaengt und wird das alte geloscht?
+        // Am I re-attached to a new one and will the old one be deleted?
         if( ((SwFmtChg*)pNew)->pChangedFmt == GetRegisteredIn() &&
             ((SwFmtChg*)pOld)->pChangedFmt->IsFmtInDTOR() )
             Invalidate();
@@ -2644,16 +2642,15 @@ SwXTextFieldMasters::~SwXTextFieldMasters()
 }
 
 /*
-    Iteration ueber nicht-Standard Feldtypen
+    Iteration over non-standard field types
     USER/SETEXP/DDE/DATABASE
-    Der Name ist demnach:
-    "com.sun.star.text.fieldmaster.User" + <Feltypname>
-    "com.sun.star.text.fieldmaster.DDE" + <Feltypname>
-    "com.sun.star.text.fieldmaster.SetExpression" + <Feltypname>
-    "com.sun.star.text.fieldmaster.DataBase" + <Feltypname>
-
-    Falls wir grosszuegig werden wollen, dann koennte man com.sun.star.text
-    auch optional weglassen
+    Thus the names are:
+    "com.sun.star.text.fieldmaster.User" + <field type name>
+    "com.sun.star.text.fieldmaster.DDE" + <field type name>
+    "com.sun.star.text.fieldmaster.SetExpression" + <field type name>
+    "com.sun.star.text.fieldmaster.DataBase" + <field type name>
+
+    If too much, maybe one could leave out the "com.sun.star.text".
  */
 static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName )
 {
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index b2636827aa26..539d9d47a610 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -186,7 +186,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
     }
 
     bool bRet = true;
-    //Anker kommt auf jeden Fall in den Set
+    // always add an anchor to the set
     SwFmtAnchor aAnchor ( static_cast < const SwFmtAnchor & > ( rFromSet.Get ( RES_ANCHOR ) ) );
     {
         const ::uno::Any* pAnchorPgNo;
@@ -2690,7 +2690,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
     if(pDoc)
     {
         SwUnoInternalPaM aIntPam(*pDoc);
-        //das muss jetzt true liefern
+        // this now needs to return TRUE
         ::sw::XTextRangeToSwPaM(aIntPam, xTextRange);
 
         SwNode& rNode = pDoc->GetNodes().GetEndOfContent();
@@ -2719,11 +2719,11 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
         //UUUU set correct parent to get the XFILL_NONE FillStyle as needed
         aFrmSet.SetParent(&pDoc->GetDfltFrmFmt()->GetAttrSet());
 
-        //jetzt muessen die passenden Items in den Set
+        // no the related items need to be added to the set
         bool bSizeFound;
         if(!pProps->AnyToItemSet( pDoc, aFrmSet, aGrSet, bSizeFound))
             throw lang::IllegalArgumentException();
-        //der TextRange wird einzeln behandelt
+        // a TextRange is handled separately
         *aPam.GetPoint() = *aIntPam.GetPoint();
         if(aIntPam.HasMark())
         {
@@ -2737,9 +2737,9 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
         {
             eAnchorId = ((const SwFmtAnchor*)pItem)->GetAnchorId();
             if( FLY_AT_FLY == eAnchorId &&
-                !aPam.GetNode().FindFlyStartNode())
+                !aPam.GetNode()->FindFlyStartNode())
             {
-                //rahmengebunden geht nur dort, wo ein Rahmen ist!
+                // framebound only where a frame exists
                 SwFmtAnchor aAnchor(FLY_AT_PARA);
                 aFrmSet.Put(aAnchor);
             }
@@ -2799,7 +2799,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                 if(!m_sName.isEmpty())
                     pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt, m_sName);
             }
-            //den SwXText wecken
+            // wake up the SwXTextFrame
             ((SwXTextFrame*)this)->SetDoc( bIsDescriptor ? m_pDoc : GetFrmFmt()->GetDoc() );
         }
         else if( eType == FLYCNTTYPE_GRF)
@@ -3034,7 +3034,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
     }
     else
         throw lang::IllegalArgumentException();
-    //setzt das Flag zurueck und loescht den Descriptor-Pointer
+    // reset the flag and delete Descriptor pointer
     ResetDescriptor();
 }
 
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index bca83baeff2d..e082e5c0fe49 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -306,7 +306,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     }
 
     SwUnoInternalPaM aPam(*pNewDoc);
-    //das muss jetzt sal_True liefern
+    // this now needs to return TRUE
     ::sw::XTextRangeToSwPaM(aPam, xTextRange);
 
     UnoActionContext aCont(pNewDoc);
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 888dfb6eed58..f615e97d084f 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1333,7 +1333,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     }
 
     SwUnoInternalPaM aPam(*pDoc);
-    //das muss jetzt sal_True liefern
+    // this now needs to return TRUE
     ::sw::XTextRangeToSwPaM(aPam, xTextRange);
 
     const SwTOXBase* pOld = pDoc->GetCurTOX( *aPam.Start() );
@@ -1855,7 +1855,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     }
 
     SwUnoInternalPaM aPam(*pDoc);
-    //which must now return sal_True
+    // this now needs to return TRUE
     ::sw::XTextRangeToSwPaM(aPam, xTextRange);
     SwTOXMark aMark (pTOXType);
     if (!m_pImpl->m_sAltText.isEmpty())
@@ -1937,8 +1937,8 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
         rPam.DeleteMark();
         bMark = false;
     }
-    // Marks ohne Alternativtext ohne selektierten Text koennen nicht eingefuegt werden,
-    // deshalb hier ein Leerzeichen - ob das die ideale Loesung ist?
+    // Marks without alternative text and without selected text cannot be inserted,
+    // thus use a space - is this really the ideal solution?
     if (!bMark && rMark.GetAlternativeText().isEmpty())
     {
         rMark.SetAlternativeText( OUString(' ') );
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 3f6734ea826f..1c350b6d3c14 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -222,7 +222,6 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
                 0 != (pAnchorPos = rAnchor.GetCntntAnchor()) &&
                     pAnchorPos->nNode == rIdx )
             {
-                //jetzt einen SwDepend anlegen und in das Array einfuegen
                 SwDepend* pNewDepend = new SwDepend( &rClnt, (SwFrmFmt*)pFmt);
 
                 // OD 2004-05-07 #i28701# - determine insert position for
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 5093f6c28c2a..69434d06d69e 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -590,7 +590,7 @@ uno::Reference< text::XTextCursor >  SwXRedline::createTextCursor(void) throw( u
         SwUnoCrsr *const pUnoCrsr = pXCursor->GetCursor();
         pUnoCrsr->Move(fnMoveForward, fnGoNode);
 
-        //steht hier eine Tabelle?
+        // is here a table?
         SwTableNode* pTblNode = pUnoCrsr->GetNode().FindTableNode();
         SwCntntNode* pCont = 0;
         while( pTblNode )
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 617ad1aeba6a..aec2d1ff4be3 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -296,7 +296,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     }
 
     SwUnoInternalPaM aPam(*pDocument);
-    //das muss jetzt sal_True liefern
+    // this now needs to return TRUE
     ::sw::XTextRangeToSwPaM(aPam, xTextRange);
     m_pImpl->InsertRefMark(aPam, dynamic_cast<SwXTextCursor*>(pCursor));
     m_pImpl->m_bIsDescriptor = false;
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 8e75c4925ce4..9013b126b3b5 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -192,7 +192,7 @@ uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name)
         uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-// der Index kommt aus const unsigned short aStyleByIndex[] =
+// the index comes from const unsigned short aStyleByIndex[] = ...
     uno::Any aRet;
     if(!IsValid())
         throw uno::RuntimeException();
@@ -845,7 +845,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen
 #if OSL_DEBUG_LEVEL > 1
                 (void)rNewBase;
 #endif
-                //so, jetzt sollten noch die Properties des Descriptors angewandt werden
+                // after all, we still need to apply the properties of the descriptor
                 pNewStyle->ApplyDescriptorProperties();
             }
             else
@@ -864,7 +864,7 @@ void SwXStyleFamily::replaceByName(const OUString& rName, const uno::Any& rEleme
     {
         pBasePool->SetSearchMask(eFamily);
         SfxStyleSheetBase* pBase = pBasePool->Find(rName);
-        //Ersetzung geht nur fuer benutzerdefinierte Styles
+        // replacements only for userdefined styles
         if(!pBase)
             throw container::NoSuchElementException();
         if(!pBase->IsUserDefined())
@@ -1811,7 +1811,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             bDone = true;
             break;
         }
-        case  FN_UNO_NUM_RULES: //Sonderbehandlung fuer das SvxNumRuleItem:
+        case  FN_UNO_NUM_RULES: // special handling for a SvxNumRuleItem:
         {
             if(aValue.getValueType() == cppu::UnoType<container::XIndexReplace>::get())
             {
@@ -1869,7 +1869,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
 
                                 aFmt.SetCharFmt( pCharFmt );
                             }
-                            //jetzt nochmal fuer Fonts
+                            // same for fonts:
                             if (!pBulletFontNames[i].isEmpty() &&
                                 !SwXNumberingRules::isInvalidStyle(pBulletFontNames[i]) &&
                                 (!pFmt->GetBulletFont() || pFmt->GetBulletFont()->GetName() != pBulletFontNames[i]) )
@@ -2358,10 +2358,10 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                 bDone = true;
                 break;
             }
-            case  FN_UNO_NUM_RULES: //Sonderbehandlung fuer das SvxNumRuleItem:
+            case  FN_UNO_NUM_RULES: // special handling for a SvxNumRuleItem:
             {
                 const SwNumRule* pRule = rBase.getNewBase()->GetNumRule();
-                OSL_ENSURE(pRule, "Wo ist die NumRule?");
+                OSL_ENSURE(pRule, "Where is the NumRule?");
                 uno::Reference< container::XIndexReplace >  xRules = new SwXNumberingRules(*pRule, pDoc);
 
                 aRet.setValue(&xRules, cppu::UnoType<container::XIndexReplace>::get());
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index fe5fb6dd106a..daf107632b57 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1775,7 +1775,7 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
     if(pUnoCrsr)
     {
         {
-            // hier muessen die Actions aufgehoben werden
+            // here, all actions need to be revoked
             UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
         }
         SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
@@ -1893,7 +1893,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
                 }
                 break;
                 case RES_BOXATR_FORMAT:
-                    //GetAttr fuer Tabellenselektion am Doc fehlt noch
+                    // TODO: GetAttr for table selections in a Doc is missing
                     OSL_FAIL("not implemented");
                 break;
                 case FN_UNO_PARA_STYLE:
@@ -1912,7 +1912,6 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
                         RES_CHRATR_BEGIN,       RES_FRMATR_END -1,
                         RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
                         0L);
-                    // erstmal die Attribute des Cursors
                     SwUnoCursorHelper::GetCrsrAttr(rTblCrsr.GetSelRing(),
                             aSet);
                     m_pPropSet->getPropertyValue(*pEntry, aSet, aRet);
@@ -2344,7 +2343,7 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex
     if(pDoc && nRows && nColumns)
     {
         SwUnoInternalPaM aPam(*pDoc);
-        //das muss jetzt sal_True liefern
+        // this now needs to return TRUE
         ::sw::XTextRangeToSwPaM(aPam, xTextRange);
 
         {
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index e6bf2304dd5c..4a3a717e1855 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -475,7 +475,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         SwCursor aCrsr(*aTmp.GetPoint(),0,false);
         SwUnoCursorHelper::SelectPam(aCrsr, true);
         aCrsr.Left(1, CRSR_SKIP_CHARS, false, false);
-        //hier muss der uebergebene PaM umgesetzt werden:
+        // here, the PaM needs to be moved:
         if (pRange)
         {
             pRange->SetPositions(aCrsr);