[Libreoffice-commits] core.git: sw/source
Matthias Freund
matti_lx at yahoo.de
Sat Feb 23 16:43:33 PST 2013
sw/source/core/edit/edattr.cxx | 26 +++++++++++++-------------
sw/source/core/edit/edredln.cxx | 6 +++---
sw/source/core/edit/edsect.cxx | 20 ++++++++++----------
3 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit cfc6473352ba68a4b40e03688cd51f2511a7b575
Author: Matthias Freund <matti_lx at yahoo.de>
Date: Sun Feb 24 00:42:37 2013 +0100
Comment translation german-english
Three small files...
Change-Id: I9dd5914caef6ca061e94d52d7abd5afb59c8ed29
Reviewed-on: https://gerrit.libreoffice.org/2353
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index d478ae6..bce5a6d 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -27,9 +27,9 @@
#include <txtftn.hxx>
#include <fmtftn.hxx>
#include <editsh.hxx>
-#include <edimp.hxx> // fuer MACROS
+#include <edimp.hxx> // for MACROS
#include <doc.hxx>
-#include <swundo.hxx> // fuer UNDO-Ids
+#include <swundo.hxx> // for UNDO-Ids
#include <ndtxt.hxx>
#include <ftnidx.hxx>
#include <expfld.hxx>
@@ -47,12 +47,12 @@
#include <algorithm>
-/*************************************
- * harte Formatierung (Attribute)
- *************************************/
+/**
+ * hard Formatting (Attributes)
+ */
-// wenn Selektion groesser Max Nodes oder mehr als Max Selektionen
-// => keine Attribute
+// if selection is bigger as max nodes or more than max selections
+// => no attributes
const sal_uInt16& getMaxLookup()
{
static const sal_uInt16 nMaxLookup = 1000;
@@ -117,8 +117,8 @@ sal_Bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
return sal_False;
}
- // beim 1.Node traegt der Node die Werte in den GetSet ein (Initial)
- // alle weiteren Nodes werden zum GetSet zu gemergt
+ // at first node the node enter his values into the GetSet (Initial)
+ // all additional nodes are additional merged to GetSet
for( sal_uLong n = nSttNd; n <= nEndNd; ++n )
{
SwNode* pNd = GetDoc()->GetNodes()[ n ];
@@ -277,7 +277,7 @@ SwTxtFmtColl* SwEditShell::GetPaMTxtFmtColl( SwPaM* pPaM ) const
sal_Bool SwEditShell::GetCurFtn( SwFmtFtn* pFillFtn )
{
- // der Cursor muss auf dem akt. Fussnoten-Anker stehen:
+ // The cursor must be positioned on the current footnotes anchor:
SwPaM* pCrsr = GetCrsr();
SwTxtNode* pTxtNd = pCrsr->GetNode()->GetTxtNode();
if( !pTxtNd )
@@ -287,7 +287,7 @@ sal_Bool SwEditShell::GetCurFtn( SwFmtFtn* pFillFtn )
pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
if( pFtn && pFillFtn )
{
- // Daten vom Attribut uebertragen
+ // Transfer data from the attribute
const SwFmtFtn &rFtn = ((SwTxtFtn*)pFtn)->GetFtn();
pFillFtn->SetNumber( rFtn );
pFillFtn->SetEndNote( rFtn.IsEndNote() );
@@ -327,7 +327,7 @@ bool SwEditShell::HasFtns( bool bEndNotes ) const
}
- // gebe Liste aller Fussnoten und deren Anfangstexte
+ // Give a List of all footnotes and their beginning texts
sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
{
rList.Clear();
@@ -424,7 +424,7 @@ void SwEditShell::MoveLeftMargin( bool bRight, bool bModulus )
StartUndo( UNDO_START );
SwPaM* pCrsr = GetCrsr();
- if( pCrsr->GetNext() != pCrsr ) // Mehrfachselektion ?
+ if( pCrsr->GetNext() != pCrsr ) // Multiple selection ?
{
SwPamRanges aRangeArr( *pCrsr );
SwPaM aPam( *pCrsr->GetPoint() );
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index abc6a34..dbefb53 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -92,7 +92,7 @@ sal_Bool SwEditShell::RejectRedline( sal_uInt16 nPos )
return bRet;
}
-// Kommentar am Redline setzen
+// Set the comment at the Redline
sal_Bool SwEditShell::SetRedlineComment( const String& rS )
{
sal_Bool bRet = sal_False;
@@ -122,8 +122,8 @@ void SwEditShell::UpdateRedlineAttr()
}
}
- // suche das Redline zu diesem Data und returne die Pos im Array
- // USHRT_MAX wird returnt, falls nicht vorhanden
+ // Search the Redline of this data and return the Pos of the Array
+ // return USHRT_MAX if not present
sal_uInt16 SwEditShell::FindRedlineOfData( const SwRedlineData& rData ) const
{
const SwRedlineTbl& rTbl = GetDoc()->GetRedlineTbl();
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index f8a6616..c7c3f920 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -23,7 +23,7 @@
#include <IDocumentUndoRedo.hxx>
#include <pam.hxx>
#include <docary.hxx>
-#include <swundo.hxx> // fuer die UndoIds
+#include <swundo.hxx> // for the UndoIds
#include <section.hxx>
#include <edimp.hxx>
#include <sectfrm.hxx> // SwSectionFrm
@@ -78,11 +78,11 @@ const SwSection* SwEditShell::GetCurrSection() const
return GetDoc()->GetCurrSection( *GetCrsr()->GetPoint() );
}
-/*--------------------------------------------------
- * SwEditShell::GetAnySection liefert den fuer Spalten
- * zustaendigen Bereich, bei Fussnoten kann es nicht der
- * Bereich innerhalb der Fussnote sein.
- * --------------------------------------------------*/
+/**
+ * SwEditShell::GetAnySection delivers the responsible area
+ * of the columns, in footnotes it may not be the
+ * area within the footnote.
+ */
const SwSection* SwEditShell::GetAnySection( sal_Bool bOutOfTab, const Point* pPt ) const
{
@@ -161,7 +161,7 @@ void SwEditShell::DelSectionFmt( sal_uInt16 nFmt )
{
StartAllAction();
GetDoc()->DelSectionFmt( GetDoc()->GetSections()[ nFmt ] );
- // rufe das AttrChangeNotify auf der UI-Seite.
+ // Call the AttrChangeNotify on the UI page.
CallChgLnk();
EndAllAction();
}
@@ -172,7 +172,7 @@ void SwEditShell::UpdateSection(sal_uInt16 const nSect,
{
StartAllAction();
GetDoc()->UpdateSection( nSect, rNewData, pAttr );
- // rufe das AttrChangeNotify auf der UI-Seite.
+ // Call the AttrChangeNotify on the UI page.
CallChgLnk();
EndAllAction();
}
@@ -249,7 +249,7 @@ void SwEditShell::_SetSectionAttr( SwSectionFmt& rSectFmt,
else
GetDoc()->SetAttr( rSet, rSectFmt );
- // rufe das AttrChangeNotify auf der UI-Seite.
+ // Call the AttrChangeNotify on the UI page.
CallChgLnk();
EndAllAction();
}
@@ -274,7 +274,7 @@ sal_uInt16 SwEditShell::GetFullSelectedSectionCount() const
break;
}
-// !!!!!!!!!!!!!!!!!!!!!!!!!!
+// !!!
// what about table at start or end ?
// There is no selection possible!
// What about only a table inside the section ?
More information about the Libreoffice-commits
mailing list