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/2140

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/2140/1

Comment translation german - english - redo of writer.cxx

Change-Id: Idf885dc8d47077800bdc648072aa45eb46c9a286
---
M sw/source/filter/writer/writer.cxx
1 file changed, 34 insertions(+), 34 deletions(-)



diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 21dd1bc..bd1de3f 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -37,7 +37,7 @@
 using namespace ::com::sun::star;
 
 
-// Stringbuffer fuer die umgewandelten Zahlen
+// Stringbuffer for the converted numbers
 static sal_Char aNToABuf[] = "0000000000000000000000000";
 #define NTOABUFLEN (sizeof(aNToABuf))
 
@@ -91,16 +91,16 @@
 }
 
 /*
- * Dieses Modul ist die Zentrale-Sammelstelle fuer alle Write-Filter
- * und ist eine DLL !
+ * This module is the central collection point for all writer-filters
+ * and is a DLL !
  *
- * Damit der Writer mit den unterschiedlichen Writern arbeiten kann,
- * muessen fuer diese die Ausgabe-Funktionen der Inhalts tragenden
- * Objecte auf die verschiedenen Ausgabe-Funktionen gemappt werden.
+ * So that the Writer can work with different writers, the output-functions
+ * of the content carrying objects have to be mapped to the various
+ * output-functions.
  *
- * Dazu kann fuer jedes Object ueber den Which-Wert in einen Tabelle ge-
- * griffen werden, um seine Ausgabe-Funktion zu erfragen.
- * Diese Funktionen stehen in den entsprechenden Writer-DLL's.
+ * For that, to inquire its output function, every object can be gripped
+ * via the which-value in a table.
+ * These functions are available in the corresponding Writer-DLL's.
  */
 
 Writer::Writer()
@@ -151,11 +151,11 @@
 {
     if( (*ppPam)->GetNext() == pOrigPam )
     {
-        *ppPam = pOrigPam;          // wieder auf den Anfangs-Pam setzen
-        return sal_False;               // Ende vom Ring
+        *ppPam = pOrigPam;          // set back to the beginning pam
+        return sal_False;               // end of the ring
     }
 
-    // ansonsten kopiere den die Werte aus dem naechsten Pam
+    // otherwise copy the next value from the next Pam
     *ppPam = ((SwPaM*)(*ppPam)->GetNext() );
 
     *pCurPam->GetPoint() = *(*ppPam)->Start();
@@ -164,7 +164,7 @@
     return sal_True;
 }
 
-// suche die naechste Bookmark-Position aus der Bookmark-Tabelle
+// search the next Bookmark-Position from the Bookmark-Table
 
 sal_Int32 Writer::FindPos_Bkmk(const SwPosition& rPos) const
 {
@@ -189,7 +189,7 @@
     SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
     if( !pCNode && 0 == ( pCNode = pNds->GoNext( &aStt )) )
     {
-        OSL_FAIL( "An StartPos kein ContentNode mehr" );
+        OSL_FAIL( "No more ContentNode at StartPos" );
     }
 
     SwPaM* pNew = new SwPaM( aStt );
@@ -198,7 +198,7 @@
     if( 0 == (pCNode = aStt.GetNode().GetCntntNode()) &&
         0 == (pCNode = pNds->GoPrevious( &aStt )) )
     {
-        OSL_FAIL( "An StartPos kein ContentNode mehr" );
+        OSL_FAIL( "No more ContentNode at StartPos" );
     }
     pCNode->MakeEndIndex( &pNew->GetPoint()->nContent );
     pNew->GetPoint()->nNode = aStt;
@@ -207,7 +207,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-// Stream-spezifisches
+// Stream-specific
 SvStream& Writer::Strm()
 {
     OSL_ENSURE( m_pImpl->m_pStream, "Oh-oh. Writer with no Stream!" );
@@ -219,7 +219,7 @@
 
 SvStream& Writer::OutLong( SvStream& rStrm, long nVal )
 {
-    // Pointer an das Bufferende setzen
+    // Set the Pointer at the end of the buffer
     sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
 
     int bNeg = nVal < 0;
@@ -231,7 +231,7 @@
         nVal /= 10;
     } while( nVal );
 
-    // Ist Zahl negativ, dann noch -
+    // is the number negative, then in addition -
     if( bNeg )
         *(--pStr) = '-';
 
@@ -240,7 +240,7 @@
 
 SvStream& Writer::OutULong( SvStream& rStrm, sal_uLong nVal )
 {
-    // Pointer an das Bufferende setzen
+    // Set the Pointer at the end of the buffer
     sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
 
     do {
@@ -266,9 +266,9 @@
     pOrigFileName = pFName;
     m_pImpl->m_pStream = &rStrm;
 
-    // PaM kopieren, damit er veraendert werden kann
+    // Copy PaM, so that it can be modified
     pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-    // zum Vergleich auf den akt. Pam sichern
+    // for comparison secure to the current Pam
     pOrigPam = &rPaM;
 
     sal_uLong nRet = WriteStream();
@@ -287,13 +287,13 @@
 
 sal_uLong Writer::Write( SwPaM& /*rPam*/, SvStorage&, const String* )
 {
-    OSL_ENSURE( !this, "Schreiben in Storages auf einem Stream?" );
+    OSL_ENSURE( !this, "Write in Storages on a stream?" );
     return ERR_SWG_WRITE_ERROR;
 }
 
 sal_uLong Writer::Write( SwPaM&, const uno::Reference < embed::XStorage >&, const String*, 
SfxMedium* )
 {
-    OSL_ENSURE( !this, "Schreiben in Storages auf einem Stream?" );
+    OSL_ENSURE( !this, "Write in Storages on a stream?" );
     return ERR_SWG_WRITE_ERROR;
 }
 
@@ -314,7 +314,7 @@
 
     if (m_pImpl->pFileNameMap)
     {
-        // wurde die Datei schon verschoben
+        // has the file been moved?
         std::map<String, String>::iterator it = m_pImpl->pFileNameMap->find( rFileNm );
         if ( it != m_pImpl->pFileNameMap->end() )
         {
@@ -352,9 +352,9 @@
 
 void Writer::PutNumFmtFontsInAttrPool()
 {
-    // dann gibt es noch in den NumRules ein paar Fonts
-    // Diese in den Pool putten. Haben sie danach einen RefCount > 1
-    // kann es wieder entfernt werden - ist schon im Pool
+    // then there are a few fonts in the NumRules
+    // These put into the Pool. After this does they have a RefCount > 1
+    // it can be removed - it is already in the Pool
     SfxItemPool& rPool = pDoc->GetAttrPool();
     const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
     const SwNumRule* pRule;
@@ -452,7 +452,7 @@
 sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, xub_StrLen nStt,
     xub_StrLen nEnd, std::vector< const ::sw::mark::IMark* >& rArr)
 {
-    OSL_ENSURE( rArr.empty(), "es sind noch Eintraege vorhanden" );
+    OSL_ENSURE( rArr.empty(), "there are still entries available" );
 
     sal_uLong nNd = rNd.GetIndex();
     std::pair<SwBookmarkNodeTable::const_iterator, SwBookmarkNodeTable::const_iterator> aIterPair 
@@ -491,11 +491,11 @@
 
 ////////////////////////////////////////////////////////////////////////////
 
-// Storage-spezifisches
+// Storage-specific
 
 sal_uLong StgWriter::WriteStream()
 {
-    OSL_ENSURE( !this, "Schreiben in Streams auf einem Storage?" );
+    OSL_ENSURE( !this, "Write in Storages on a stream?" );
     return ERR_SWG_WRITE_ERROR;
 }
 
@@ -506,9 +506,9 @@
     pDoc = rPaM.GetDoc();
     pOrigFileName = pFName;
 
-    // PaM kopieren, damit er veraendert werden kann
+    // Copy PaM, so that it can be modified
     pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-    // zum Vergleich auf den akt. Pam sichern
+    // for comparison secure to the current Pam
     pOrigPam = &rPaM;
 
     sal_uLong nRet = WriteStorage();
@@ -527,9 +527,9 @@
     pDoc = rPaM.GetDoc();
     pOrigFileName = pFName;
 
-    // PaM kopieren, damit er veraendert werden kann
+    // Copy PaM, so that it can be modified
     pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-    // zum Vergleich auf den akt. Pam sichern
+    // for comparison secure to the current Pam
     pOrigPam = &rPaM;
 
     sal_uLong nRet = pMedium ? WriteMedium( *pMedium ) : WriteStorage();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf885dc8d47077800bdc648072aa45eb46c9a286
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.