[Libreoffice-commits] .: sc/source
Eike Rathke
erack at kemper.freedesktop.org
Sun Sep 11 12:50:41 PDT 2011
sc/source/core/data/cell2.cxx | 22 +++++++++++-----------
sc/source/core/data/column.cxx | 36 ++++++++++++++++++------------------
2 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 2626e67b1e9bf8d38be1ffe7a8102ffbf1db98de
Author: Eike Rathke <erack at erack.de>
Date: Sun Sep 11 21:50:22 2011 +0200
translated some comments
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 098a6a3..b69d2af 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -593,9 +593,9 @@ sal_Bool ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const
4 16
2
- innerhalb: 1
- ausserhalb: 0
- (reserviert: offen: 32)
+ inside: 1
+ outside: 0
+ (reserved: open: 32)
*/
sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
@@ -609,16 +609,16 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
static SCROW nR;
ScAddress aOrg;
if ( !GetMatrixOrigin( aOrg ) )
- return 0; // dumm gelaufen..
+ return 0; // bad luck..
if ( aOrg != rOrgPos )
- { // erstes Mal oder andere Matrix als letztes Mal
+ { // First time or a different matrix than last time.
rOrgPos = aOrg;
ScFormulaCell* pFCell;
if ( cMatrixFlag == MM_REFERENCE )
pFCell = (ScFormulaCell*) pDocument->GetCell( aOrg );
else
pFCell = this; // this MM_FORMULA
- // this gibt's nur einmal, kein Vergleich auf pFCell==this
+ // There's only one this, don't compare pFCell==this.
if ( pFCell && pFCell->GetCellType() == CELLTYPE_FORMULA
&& pFCell->cMatrixFlag == MM_FORMULA )
{
@@ -689,15 +689,15 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
if ( dC >= 0 && dR >= 0 && dC < nC && dR < nR )
{
if ( dC == 0 )
- nEdges |= 4; // linke Kante
+ nEdges |= 4; // left edge
if ( dC+1 == nC )
- nEdges |= 16; // rechte Kante
+ nEdges |= 16; // right edge
if ( dR == 0 )
- nEdges |= 8; // obere Kante
+ nEdges |= 8; // top edge
if ( dR+1 == nR )
- nEdges |= 2; // untere Kante
+ nEdges |= 2; // bottom edge
if ( !nEdges )
- nEdges = 1; // mittendrin
+ nEdges = 1; // inside
}
#if OSL_DEBUG_LEVEL > 0
else
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 055dec5..02e8bee 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -119,7 +119,7 @@ SCsROW ScColumn::GetNextUnprotected( SCROW nRow, bool bUp ) const
sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
{
- // nix:0, mitte:1, unten:2, links:4, oben:8, rechts:16, offen:32
+ // nothing:0, inside:1, bottom:2, left:4, top:8, right:16, open:32
if ( !pItems )
return 0;
if ( nRow1 == nRow2 )
@@ -154,24 +154,24 @@ sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 n
if ( nEdges )
{
if ( nEdges & 8 )
- bOpen = true; // obere Kante oeffnet, weitersehen
+ bOpen = true; // top edge opens, keep on looking
else if ( !bOpen )
- return nEdges | 32; // es gibt was, was nicht geoeffnet wurde
+ return nEdges | 32; // there's something that wasn't opened
else if ( nEdges & 1 )
- return nEdges; // mittendrin
- // (nMask & 16 und (4 und nicht 16)) oder
- // (nMask & 4 und (16 und nicht 4))
+ return nEdges; // inside
+ // (nMask & 16 and (4 and not 16)) or
+ // (nMask & 4 and (16 and not 4))
if ( ((nMask & 16) && (nEdges & 4) && !(nEdges & 16))
|| ((nMask & 4) && (nEdges & 16) && !(nEdges & 4)) )
- return nEdges; // nur linke/rechte Kante
+ return nEdges; // only left/right edge
if ( nEdges & 2 )
- bOpen = false; // untere Kante schliesst
+ bOpen = false; // bottom edge closes
}
}
nIndex++;
}
if ( bOpen )
- nEdges |= 32; // es geht noch weiter
+ nEdges |= 32; // not closed, matrix continues
return nEdges;
}
}
@@ -203,21 +203,21 @@ bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
if ( nEdges )
{
if ( nEdges & 8 )
- bOpen = true; // obere Kante oeffnet, weitersehen
+ bOpen = true; // top edge opens, keep on looking
else if ( !bOpen )
- return true; // es gibt was, was nicht geoeffnet wurde
+ return true; // there's something that wasn't opened
else if ( nEdges & 1 )
- bFound = true; // mittendrin, alles selektiert?
- // (4 und nicht 16) oder (16 und nicht 4)
+ bFound = true; // inside, all selected?
+ // (4 and not 16) or (16 and not 4)
if ( (((nEdges & 4) | 16) ^ ((nEdges & 16) | 4)) )
- bFound = true; // nur linke/rechte Kante, alles selektiert?
+ bFound = true; // only left/right edge, all selected?
if ( nEdges & 2 )
- bOpen = false; // untere Kante schliesst
+ bOpen = false; // bottom edge closes
if ( bFound )
- { // alles selektiert?
+ { // all selected?
if ( aCurOrg != aOrg )
- { // neue Matrix zu pruefen?
+ { // new matrix to check?
aCurOrg = aOrg;
ScFormulaCell* pFCell;
if ( ((ScFormulaCell*)pCell)->GetMatrixFlag()
@@ -235,7 +235,7 @@ bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
bFound = false;
}
else
- bFound = false; // war schon
+ bFound = false; // done already
}
}
}
More information about the Libreoffice-commits
mailing list