Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2092

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/2092/1

Comment translation german - english

Change-Id: I76c5124ff13abe4610b8cc9a07ba75e038c02e8b
---
M sw/source/core/crsr/crsrsh.cxx
M sw/source/core/crsr/pam.cxx
M sw/source/core/doc/doc.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/doccorr.cxx
M sw/source/core/doc/docdraw.cxx
M sw/source/core/doc/tblrwcl.cxx
7 files changed, 12 insertions(+), 12 deletions(-)



diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a87677f..e417c92 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2017,7 +2017,7 @@
     if( !bBasicHideCrsr )
     {
         bSVCrsrVis = sal_False;
-        // evt. die sel. Bereiche aufheben !!
+        // possibly reverse selected areas!!
         SET_CURR_SHELL( this );
         pVisCrsr->Hide();
     }
@@ -2529,7 +2529,7 @@
     SwNodes& rNds = rDoc.GetNodes();
 
     SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
-    SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // gehe zum 1. ContentNode
+    SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first ContentNode
 
     pCurCrsr = new SwShellCrsr( *this, SwPosition( aNodeIdx, SwIndex( pCNd, 0 )));
 
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 505477a..741679e 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -667,7 +667,7 @@
                     if( pFmt->GetProtect().IsCntntProtected() )
                     {
                         const SwFmtCntnt& rCntnt = pFmt->GetCntnt(sal_False);
-                        OSL_ENSURE( rCntnt.GetCntntIdx(), "wo ist der SectionNode?" );
+                        OSL_ENSURE( rCntnt.GetCntntIdx(), "where is the SectionNode?" );
                         sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
                         if( nSttIdx <= nIdx && nEndIdx >= nIdx &&
                             rCntnt.GetCntntIdx()->GetNode().GetNodes().IsDocNodes() )
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 80cfa84..993eefc 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1221,7 +1221,7 @@
     bool bHasPostIts = false;
 
     SwFieldType* pFldType = pIDFA->GetSysFldType( RES_POSTITFLD );
-    OSL_ENSURE( pFldType, "kein PostItType ? ");
+    OSL_ENSURE( pFldType, "no PostItType ? ");
 
     if( pFldType->GetDepends() )
     {
@@ -1575,7 +1575,7 @@
     sal_Int32 i = 0;
     for ( i = 1; pStPage && i < nDocPageCount; ++i )
         pStPage = (SwPageFrm*)pStPage->GetNext();
-    if ( !pStPage )          // dann wars das
+    if ( !pStPage )          // Then it was that
         return;
 
     // currently for prospect printing all pages are valid to be printed
@@ -2486,7 +2486,7 @@
     return mbLinksUpdated;
 }
 
-// embedded alle lokalen Links (Bereiche/Grafiken)
+// embedded all local links (Areas/Graphics)
 static ::sfx2::SvBaseLink* lcl_FindNextRemovableLink( const ::sfx2::SvBaseLinks& rLinks, 
sfx2::LinkManager& rLnkMgr )
 {
     for( sal_uInt16 n = 0; n < rLinks.size(); ++n )
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 594b03b..0df87ac 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -497,7 +497,7 @@
         for( size_t n = 0; n < rData.GetLineCount(); ++n )
         {
             const CompareLine* pLine = rData.GetLine( n );
-            OSL_ENSURE( pLine, "wo ist die Line?" );
+            OSL_ENSURE( pLine, "where is the line?" );
             sal_uLong nH = pLine->GetHashValue();
 
             sal_uLong* pFound = &pHashArr[ nH % nPrime ];
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 2379c71..50868ea 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -319,7 +319,7 @@
         SwPosition aNewPos(rNewPos);
         for( sal_uInt16 n = 0; n < rTbl.size(); ++n )
         {
-            // liegt auf der Position ??
+            // lies on the position ??
             lcl_PaMCorrRel1( rTbl[ n ], &rOldNode.GetNode(), aNewPos, aNewPos.nContent.GetIndex() 
+ nOffset );
         }
     }
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 25a5a4e..c8d9ed3 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -523,7 +523,7 @@
                 nOrdNum = pContact->GetMaster()->GetOrdNum();
     }
     else {
-        OSL_ENSURE( !this, "was ist das fuer ein Format?" );
+        OSL_ENSURE( !this, "what is that for a format?" );
     }
 }
 
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 9818bde..3635be5 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1214,7 +1214,7 @@
     for (size_t n = 0; n < aSelBoxes.size(); ++n)
     {
         SwTableBox* pSelBox = aSelBoxes[n];
-        OSL_ENSURE( pSelBox, "Box steht nicht in der Tabelle" );
+        OSL_ENSURE( pSelBox, "Box is not in the table" );
 
         // We don't want to split small table cells into very very small cells
         if( pSelBox->GetFrmFmt()->GetFrmSize().GetWidth()/( nCnt + 1 ) < 10 )
@@ -1610,7 +1610,7 @@
 
     SwTableLine* pNewLine = new SwTableLine(
         (SwTableLineFmt*)rFndLine.GetLine()->GetFrmFmt(), 0, pULPara->pInsBox );
-    _InsULPara aPara( *pULPara );       // kopieren
+    _InsULPara aPara( *pULPara );       // copying
     aPara.pInsLine = pNewLine;
     _FndBoxes & rLineBoxes = rFndLine.GetBoxes();
     for (_FndBoxes::iterator it = rLineBoxes.begin() + nStt;
@@ -2823,7 +2823,7 @@
                 SwTwips nDiff;
                 if( TBLFIX_CHGPROP == rParam.nMode )        // Table fixed, proportional
                 {
-                    // relativ berechnen
+                    // calculate relatively
                     nDiff = nWidth;
                     nDiff *= rParam.nDiff;
                     nDiff /= rParam.nRemainWidth;

-- 
To view, visit https://gerrit.libreoffice.org/2092
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76c5124ff13abe4610b8cc9a07ba75e038c02e8b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.