diff options
author | Matthias Freund <matti_lx@yahoo.de> | 2013-02-24 14:32:28 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-02-24 16:50:19 +0000 |
commit | 4261ddd0082d3a62d0e54dac22f1dbd1d29d095d (patch) | |
tree | f6605cdabe1a4f770c0d04f004e718d23a241d11 /sw/source | |
parent | 8214ea86075fab7b1c5e3f1bdfe6d347ad12c759 (diff) |
Comment translation german-english
Change-Id: If22ef967efa8010d19b7e32d588179cfcacd0780
Reviewed-on: https://gerrit.libreoffice.org/2359
Reviewed-by: Joren De Cuyper <joren.libreoffice@telenet.be>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/filter/writer/wrt_fn.cxx | 10 | ||||
-rw-r--r-- | sw/source/filter/writer/wrtswtbl.cxx | 89 |
2 files changed, 45 insertions, 54 deletions
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx index 9374d39f5e10..4011ddb70e48 100644 --- a/sw/source/filter/writer/wrt_fn.cxx +++ b/sw/source/filter/writer/wrt_fn.cxx @@ -43,10 +43,10 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt, const SfxItemSet& rSet, sal_Bool bDeep, sal_Bool bTstForDefault ) { - // erst die eigenen Attribute ausgeben + // at first give the own attributes out const SfxItemPool& rPool = *rSet.GetPool(); const SfxItemSet* pSet = &rSet; - if( !pSet->Count() ) // Optimierung - leere Sets + if( !pSet->Count() ) // Optimizing - empty Sets { if( !bDeep ) return rWrt; @@ -59,7 +59,7 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt, FnAttrOut pOut; if( !bDeep || !pSet->GetParent() ) { - OSL_ENSURE( rSet.Count(), "Wurde doch schon behandelt oder?" ); + OSL_ENSURE( rSet.Count(), "It has been handled already, right?" ); SfxItemIter aIter( *pSet ); pItem = aIter.GetCurItem(); do { @@ -90,7 +90,7 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt, Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt ) { - // es muss ein CntntNode sein !! + // It must be a CntntNode !! SwCntntNode * pCNd = rNode.GetCntntNode(); if( !pCNd ) return rWrt; @@ -108,7 +108,7 @@ Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt ) nId = RES_OLENODE; break; default: - OSL_FAIL("was fuer ein Node ist es denn nun?"); + OSL_FAIL("What kind of node is it now?"); break; } FnNodeOut pOut; diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 4be861ef12cd..c78d006ba4f1 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -32,8 +32,6 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; -//----------------------------------------------------------------------- - sal_Int16 SwWriteTableCell::GetVertOri() const { sal_Int16 eCellVertOri = text::VertOrientation::TOP; @@ -53,8 +51,6 @@ sal_Int16 SwWriteTableCell::GetVertOri() const return eCellVertOri; } -//----------------------------------------------------------------------- - SwWriteTableRow::SwWriteTableRow( long nPosition, bool bUseLayoutHeights ) : pBackground(0), nPos(nPosition), mbUseLayoutHeights(bUseLayoutHeights), nTopBorder(USHRT_MAX), nBottomBorder(USHRT_MAX), bTopBorder(true), @@ -76,16 +72,12 @@ SwWriteTableCell *SwWriteTableRow::AddCell( const SwTableBox *pBox, return pCell; } -//----------------------------------------------------------------------- - SwWriteTableCol::SwWriteTableCol(sal_uInt32 nPosition) : nPos(nPosition), nWidthOpt(0), bRelWidthOpt(false), bOutWidth(true), bLeftBorder(true), bRightBorder(true) { } -//----------------------------------------------------------------------- - sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox ) { const SwFrmFmt *pFmt = pBox->GetFrmFmt(); @@ -105,20 +97,20 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine ) long nHeight = 0; if( bUseLayoutHeights ) { - // Erstmal versuchen wir die Hoehe ueber das Layout zu bekommen + // At first we try to get the height of the layout. bool bLayoutAvailable = false; nHeight = pLine->GetTableLineHeight(bLayoutAvailable); if( nHeight > 0 ) return nHeight; - // Wenn kein Layout gefunden wurde, gehen wir von festen Hoehen aus. + // If no layout is found, we assume that the heights are fixed. // #i60390# - in some cases we still want to continue // to use the layout heights even if one of the rows has a height of 0 // ('hidden' rows) bUseLayoutHeights = bLayoutAvailable; #ifdef DBG_UTIL - SAL_WARN_IF( !bLayoutAvailable && bOldGetLineHeightCalled, "sw", "Layout ungueltig?" ); + SAL_WARN_IF( !bLayoutAvailable && bOldGetLineHeightCalled, "sw", "Layout invalid?" ); #endif } @@ -304,7 +296,7 @@ sal_uInt16 SwWriteTable::GetLeftSpace( sal_uInt16 nCol ) const { sal_uInt16 nSpace = nCellPadding + nCellSpacing; - // In der ersten Spalte auch noch die Liniendicke abziehen + // Additional subtract the line thickness in the first column. if( nCol==0 ) { nSpace = nSpace + nLeftSub; @@ -322,8 +314,8 @@ SwWriteTable::GetRightSpace(size_t const nCol, sal_uInt16 nColSpan) const { sal_uInt16 nSpace = nCellPadding; - // In der letzten Spalte noch einmal zusaetzlich CELLSPACING und - // und die Liniendicke abziehen + // Additional subtract in the last column CELLSPACING and + // line thickness once again. if( nCol+nColSpan==aCols.size() ) { nSpace += (nCellSpacing + nRightSub); @@ -347,7 +339,7 @@ sal_uInt16 SwWriteTable::GetAbsWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) con nWidth -= GetLeftSpace( nCol ) + GetRightSpace( nCol, nColSpan ); - OSL_ENSURE( nWidth > 0, "Spaltenbreite <= 0. OK?" ); + OSL_ENSURE( nWidth > 0, "Column Width <= 0. OK?" ); return nWidth > 0 ? (sal_uInt16)nWidth : 0; } @@ -363,8 +355,8 @@ sal_uInt16 SwWriteTable::GetPrcWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) con { long nWidth = GetRawWidth( nCol, nColSpan ); - // sieht komisch aus, ist aber nichts anderes als - // [(100 * nWidth) + .5] ohne Rundungsfehler + // Looks funny, but is nothing more than + // [(100 * nWidth) + .5] without rounding errors return (sal_uInt16)(long)Fraction( nWidth*100 + GetBaseWidth()/2, GetBaseWidth() ); } @@ -374,8 +366,8 @@ long SwWriteTable::GetAbsHeight(long nRawHeight, size_t const nRow, { nRawHeight -= (2*nCellPadding + nCellSpacing); - // In der ersten Zeile noch einmal zusaetzlich CELLSPACING und - // und die Liniendicke abziehen + // Additional subtract in the first column CELLSPACING and + // line thickness once again. const SwWriteTableRow *pRow = 0; if( nRow==0 ) { @@ -385,7 +377,7 @@ long SwWriteTable::GetAbsHeight(long nRawHeight, size_t const nRow, nRawHeight -= nBorder; } - // In der letzten Zeile noch die Liniendicke abziehen + // Subtract the line thickness in the last column if( nRow+nRowSpan==aRows.size() ) { if( !pRow || nRowSpan > 1 ) @@ -394,7 +386,7 @@ long SwWriteTable::GetAbsHeight(long nRawHeight, size_t const nRow, nRawHeight -= nBorder; } - OSL_ENSURE( nRawHeight > 0, "Zeilenheohe <= 0. OK?" ); + OSL_ENSURE( nRawHeight > 0, "Row Height <= 0. OK?" ); return nRawHeight > 0 ? nRawHeight : 0; } @@ -453,16 +445,16 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos, nRPos = nStartRPos + nParentLineHeight; #if OSL_DEBUG_LEVEL > 0 SwWriteTableRow aSrchRow( nRPos, bUseLayoutHeights ); - OSL_ENSURE( aRows.find( &aSrchRow ) != aRows.end(), "Parent-Zeile nicht gefunden" ); + OSL_ENSURE( aRows.find( &aSrchRow ) != aRows.end(), "Parent-Row not found" ); SwWriteTableRow aRowCheckPos(nCheckPos,bUseLayoutHeights); SwWriteTableRow aRowRPos(nRPos,bUseLayoutHeights); OSL_ENSURE( !bUseLayoutHeights || aRowCheckPos == aRowRPos, - "Hoehe der Zeilen stimmt nicht mit Parent ueberein" ); + "Height of the rows does not correspond with the parent" ); #endif } - // Fuer alle Boxen der Zeile ggf. eine Spalte einfuegen + // If necessary insert a column for all boxes of the row const SwTableBoxes& rBoxes = pLine->GetTabBoxes(); sal_uInt16 nBoxes = rBoxes.size(); @@ -484,7 +476,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos, if( nBox==nBoxes-1 ) { OSL_ENSURE( nLine==0 && nParentLineWidth==0, - "Jetzt wird die Parent-Breite plattgemacht!" ); + "Now the parent width will be flattened!" ); nParentLineWidth = nCPos-nStartCPos; } } @@ -500,7 +492,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos, { OSL_ENSURE( SwWriteTableCol(nCheckPos) == SwWriteTableCol(nEndCPos), - "Zelle enthaelt unterschiedlich breite Zeilen" ); + "Cell includes rows of different widths" ); } #endif nCPos = nStartCPos + nParentLineWidth; @@ -508,10 +500,10 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos, #if OSL_DEBUG_LEVEL > 0 SwWriteTableCol aSrchCol( nCPos ); OSL_ENSURE( aCols.find( &aSrchCol ) != aCols.end(), - "Parent-Zelle nicht gefunden" ); + "Parent-Cell not found" ); OSL_ENSURE( SwWriteTableCol(nCheckPos) == SwWriteTableCol(nCPos), - "Breite der Zellen stimmt nicht mit Parent ueberein" ); + "Width of the cells does not correspond with the parent" ); #endif } @@ -541,7 +533,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, sal_uInt16 nLines = rLines.size(); sal_Bool bSubExpanded = sal_False; - // Festlegen der Umrandung + // Specifying the border long nRPos = nStartRPos; sal_uInt16 nRow = nStartRow; @@ -549,7 +541,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, { const SwTableLine *pLine = rLines[nLine]; - // Position der letzten ueberdeckten Zeile ermitteln + // Determine the postition of the last covered row long nOldRPos = nRPos; if( nLine < nLines-1 || nParentLineHeight==0 ) { @@ -568,7 +560,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, else nRPos = nStartRPos + nParentLineHeight; - // Und ihren Index + // And their index sal_uInt16 nOldRow = nRow; SwWriteTableRow aSrchRow( nRPos,bUseLayoutHeights ); SwWriteTableRows::const_iterator it2 = aRows.find( &aSrchRow ); @@ -606,9 +598,9 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, { pLineBrush = (const SvxBrushItem *)pItem; - // Wenn die Zeile die gesamte Tabelle umspannt, koennen - // Wir den Hintergrund an der Zeile ausgeben. Sonst muessen - // wir in an den Zelle ausgeben. + // If the row spans the entire table, we can + // print out the background to the row. Otherwise + // we have to print out into the cell. sal_Bool bOutAtRow = !nParentLineWidth; if( !bOutAtRow && nStartCPos==0 ) { @@ -637,7 +629,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, { const SwTableBox *pBox = rBoxes[nBox]; - // Position der letzten ueberdeckten Spalte ermitteln + // Determine the postition of the last covered column sal_uInt32 nOldCPos = nCPos; if( nBox < nBoxes-1 || (nParentLineWidth==0 && nLine==0) ) { @@ -648,7 +640,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, else nCPos = nStartCPos + nParentLineWidth; - // Und ihren Index + // And their index sal_uInt16 nOldCol = nCol; SwWriteTableCol aSrchCol( nCPos ); SwWriteTableCols::const_iterator it = aCols.find( &aSrchCol ); @@ -670,7 +662,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, pRow->AddCell( pBox, nOldRow, nOldCol, nRowSpan, nColSpan, nHeight, pBrushItem ); - nHeight = 0; // Die Hoehe braucht nur einmal geschieben werden + nHeight = 0; // The height requires only to be written once if( pBox->GetSttNd() ) { @@ -723,7 +715,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, bSubExpanded = sal_True; } - nCol++; // Die naechste Zelle faengt in der nachten Spalte an + nCol++; // The next cell begins in the next column } nRow++; @@ -744,16 +736,16 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long nWidth, { sal_uInt32 nParentWidth = nBaseWidth + nLeftSub + nRightSub; - // Erstmal die Tabellen-Struktur festlegen. Hinter der Tabelle ist in - // jedem Fall eine Spalte zu Ende + // First the table structure set. Behind the table is in each + // case the end of a column SwWriteTableCol *pCol = new SwWriteTableCol( nParentWidth ); aCols.insert( pCol ); CollectTableRowsCols( 0, 0, 0, nParentWidth, rLines, nMaxDepth - 1 ); - // Und jetzt mit leben fuellen + // And now fill with life FillTableRowsCols( 0, 0, 0, 0, 0, nParentWidth, rLines, 0, nMaxDepth - 1, static_cast< sal_uInt16 >(nNumOfRowsToRepeat) ); - // Einige Twip-Werte an Pixel-Grenzen anpassen + // Adjust some Twip values to pixel boundaries if( !nBorder ) nBorder = nInnerBorder; } @@ -781,7 +773,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo ) sal_uInt16 nCols = pLayoutInfo->GetColCount(); sal_uInt16 nRows = pLayoutInfo->GetRowCount(); - // Erstmal die Tabellen-Struktur festlegen. + // First set the table structure. for( nCol=0; nCol<nCols; nCol++ ) { SwWriteTableCol *pCol = @@ -807,7 +799,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo ) aRows.insert( pRow ); } - // Und jetzt mit leben fuellen + // And now fill with life for( nRow=0; nRow<nRows; nRow++ ) { SwWriteTableRow *pRow = aRows[nRow]; @@ -821,8 +813,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo ) const SwHTMLTableLayoutCnts *pLayoutCnts = pLayoutCell->GetContents(); - // Beginnt die Zelle eigentlich eine Zeile weiter oben oder - // weiter vorne? + // The cell begins actually a row above or further forward? if( ( nRow>0 && pLayoutCnts == pLayoutInfo->GetCell(nRow-1,nCol) ->GetContents() ) || ( nCol>0 && pLayoutCnts == pLayoutInfo->GetCell(nRow,nCol-1) @@ -835,7 +826,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo ) sal_uInt16 nColSpan = pLayoutCell->GetColSpan(); const SwTableBox *pBox = pLayoutCnts->GetTableBox(); OSL_ENSURE( pBox, - "Tabelle in Tabelle kann nicht ueber Layout exportiert werden" ); + "Table in Table can not be exported over layout" ); long nHeight = bHeightExported ? 0 : GetLineHeight( pBox ); const SvxBrushItem *pBrushItem = GetLineBrush( pBox, pRow ); @@ -866,13 +857,13 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo ) if( !(nBorderMask & 2) ) pEndRow->bBottomBorder = false; - // Die Hoehe braucht nur einmal geschieben werden + // The height requires only to be written once if( nHeight ) bHeightExported = sal_True; } } - // Einige Twip-Werte an Pixel-Grenzen anpassen + // Adjust some Twip values to pixel boundaries if( bCollectBorderWidth && !nBorder ) nBorder = nInnerBorder; } |