sc/source/core/data/table4.cxx | 2 +-
sc/source/core/data/table5.cxx | 18 +++++++++---------
sc/source/core/data/table6.cxx | 24 ++++++++++++------------
3 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 7f5a0495eb5579101f58d9fec10153486c91a40a
Author: Albert Thuswaldner <albert.thuswald...@gmail.com>
Date: Thu Feb 12 21:40:57 2015 +0100
Translated german commments in sc/source/core/data/table4-6.cxx
Change-Id: I18343a3c571269f9b326ffd1acc6e10e3f82d2a2
Reviewed-on: https://gerrit.libreoffice.org/14452
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index b7840ee..1fc9884 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -286,7 +286,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2,
nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
}
else
- bVal = false; // kein Datum passt auch nicht
+ bVal = false; // No date is also not ok
}
if (bVal)
{
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index dac0786..2d45f1a 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -100,7 +100,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
sal_uInt16 nAreaCount = GetPrintRangeCount();
if ( nAreaCount > 1 )
{
- // bei mehreren Bereichen nichts anzeigen:
+ // Show nothing, when multiple ranges
for (nX=0; nX<MAXCOL; nX++)
RemoveColBreak(nX, true, false);
@@ -119,7 +119,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
nEndCol = pArea->aEnd.Col();
nEndRow = pArea->aEnd.Row();
}
- } // sonst alles
+ } // otherwise show everything
}
// get bSkipColBreaks/bSkipRowBreaks flags:
@@ -151,7 +151,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
long nPageSizeX = aPageSizeTwips.Width();
long nPageSizeY = aPageSizeTwips.Height();
- // Anfang: Breaks loeschen
+ // Beginning: Remove breaks
for (nX=0; nX<nStartCol; nX++)
RemoveColBreak(nX, true, false);
@@ -162,7 +162,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
if (nStartRow > 0)
SetRowBreak(nStartRow, true, false); // AREABREAK
- // Mittelteil: Breaks verteilen
+ // Middle part: Distribute breaks
bool bRepeatCol = ( nRepeatStartX != SCCOL_REPEAT_NONE );
bool bColFound = false;
@@ -288,7 +288,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
nSizeY += nThisY;
}
- // Ende: Breaks loeschen
+ // End: Remove Break
if (nEndCol < MAXCOL)
{
@@ -1072,7 +1072,7 @@ Size ScTable::GetPageSize() const
if ( bPageSizeValid )
return aPageSizeTwips;
else
- return Size(); // leer
+ return Size(); // blank
}
void ScTable::SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow,
SCROW nEndRow )
@@ -1150,7 +1150,7 @@ void ScTable::SetPageStyle( const OUString& rName )
InvalidateTextWidth(NULL, NULL, false, false);
}
- if ( pNewStyle ) // auch ohne den alten (fuer
UpdateStdNames)
+ if ( pNewStyle ) // also without the old one (for
UpdateStdNames)
aPageStyle = aStrNew;
if (IsStreamValid())
@@ -1184,7 +1184,7 @@ void ScTable::InvalidateTextWidth( const ScAddress*
pAdrFrom, const ScAddress* p
rCol.SetScriptType(nRow, SC_SCRIPTTYPE_UNKNOWN);
if ( bBroadcast )
- { // nur bei CalcAsShown
+ { // Only with CalcAsShown
switch (aCell.meType)
{
case CELLTYPE_VALUE :
@@ -1224,7 +1224,7 @@ void ScTable::InvalidateTextWidth( const ScAddress*
pAdrFrom, const ScAddress* p
aCol[nCol].SetScriptType(nRow, SC_SCRIPTTYPE_UNKNOWN);
if ( bBroadcast )
- { // nur bei CalcAsShown
+ { // Only with CalcAsShown
switch (aCell.meType)
{
case CELLTYPE_VALUE :
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 5272a48..3375df4 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -134,10 +134,10 @@ bool ScTable::SearchCell(const SvxSearchItem&
rSearchItem, SCCOL nCol, SCROW nRo
if ( bFound &&
( (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE)
||(rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) ) &&
- // Matrix nicht zerreissen, nur Matrixformel ersetzen
+ // Don't split the matrix, only replace Matrix formulas
!( (eCellType == CELLTYPE_FORMULA &&
((cMatrixFlag = aCell.mpFormula->GetMatrixFlag()) == MM_REFERENCE))
- // kein UndoDoc => Matrix nicht wiederherstellbar => nicht ersetzen
+ // No UndoDoc => Matrix not restorable => don't replace
|| (cMatrixFlag != MM_NONE && !pUndoDoc) ) &&
IsBlockEditable(nCol, nRow, nCol, nRow)
)
@@ -152,8 +152,8 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem,
SCCOL nCol, SCROW nRo
bool bRepeat = !rSearchItem.GetWordOnly();
do
{
- // wenn der gefundene Text leer ist, nicht weitersuchen,
- // sonst wuerde man nie mehr aufhoeren (#35410#)
+ // don't continue search if the found text is empty,
+ // otherwise it would never stop (#35410#)
if ( nEnd < nStart )
bRepeat = false;
@@ -174,7 +174,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem,
SCCOL nCol, SCROW nRo
aString = aStrBuffer.makeStringAndClear();
}
- // Indizes anpassen
+ // Adjust index
if (bDoBack)
{
nEnd = nStart;
@@ -186,7 +186,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem,
SCCOL nCol, SCROW nRo
nEnd = aString.getLength();
}
- // weitersuchen ?
+ // continue search ?
if (bRepeat)
{
if ( rSearchItem.GetCommand() != SVX_SEARCHCMD_REPLACE_ALL ||
nStart >= nEnd )
@@ -209,9 +209,9 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem,
SCCOL nCol, SCROW nRo
while (bRepeat);
if ( cMatrixFlag != MM_NONE )
- { // Matrix nicht zerreissen
+ { // don't split Matrix
if ( aString.getLength() > 2 )
- { // {} raus, erst hier damit auch "{=" durch "{=..." ersetzt
werden kann
+ { // remove {} here so that "{=" can be replaced by "{=..."
if ( aString[ aString.getLength()-1 ] == '}' )
aString = aString.copy( 0, aString.getLength()-1 );
if ( aString[0] == '{' )
@@ -534,7 +534,7 @@ bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem,
SCCOL& rCol, SCROW&
bool bBack = rSearchItem.GetBackward();
short nAdd = bBack ? -1 : 1;
- if (bRows) // zeilenweise
+ if (bRows) // by row
{
if (!ValidCol(nCol))
{
@@ -558,7 +558,7 @@ bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem,
SCCOL& rCol, SCROW&
}
while (!bFound && ValidCol(nCol));
}
- else // spaltenweise
+ else // by column
{
SCsROW nNextRows[MAXCOLCOUNT];
SCsCOL i;
@@ -569,7 +569,7 @@ bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem,
SCCOL& rCol, SCROW&
else { if (i<=nCol) ++nSRow; }
nNextRows[i] = aCol[i].SearchStyle( nSRow, pSearchStyle, bBack,
bSelect, rMark );
}
- if (bBack) // rueckwaerts
+ if (bBack) // backwards
{
nRow = -1;
for (i=MAXCOL; i>=0; i--)
@@ -580,7 +580,7 @@ bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem,
SCCOL& rCol, SCROW&
bFound = true;
}
}
- else // vorwaerts
+ else // forwards
{
nRow = MAXROW+1;
for (i=0; i<=MAXCOL; i++)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
