[Libreoffice-commits] .: sc/inc
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Fri Jan 28 14:49:24 PST 2011
sc/inc/progress.hxx | 8 ++++----
sc/inc/rangelst.hxx | 5 +++--
sc/inc/rangenam.hxx | 8 ++++----
sc/inc/rangeutl.hxx | 2 +-
sc/inc/rechead.hxx | 48 +++++++++++++++++++++++-------------------------
5 files changed, 35 insertions(+), 36 deletions(-)
New commits:
commit 73c2a5c51fa9b1c0ccb9c0a0f80e0b89f26fd98f
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Fri Jan 28 23:45:43 2011 +0100
Translated comments from German to English
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index ba5f124..3576add 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -89,10 +89,10 @@ public:
~ScProgress();
#ifdef SC_PROGRESS_CXX
- // nur fuer DummyInterpret, sonst nie benutzen!!!
+ // for DummyInterpret only, never use otherwise!!!
ScProgress();
#endif
- // kann NULL sein!
+ // might be NULL!
SfxProgress* GetSfxProgress() const { return pProgress; }
BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 )
@@ -133,14 +133,14 @@ public:
return TRUE;
}
BOOL SetStateOnPercent( ULONG nVal )
- { // nur wenn Prozent mehr als vorher
+ { // only if percentage increased
if ( nGlobalRange && (nVal * 100 /
nGlobalRange) > nGlobalPercent )
return SetState( nVal );
return TRUE;
}
BOOL SetStateCountDownOnPercent( ULONG nVal )
- { // nur wenn Prozent mehr als vorher
+ { // only if percentage increased
if ( nGlobalRange &&
((nGlobalRange - nVal) * 100 /
nGlobalRange) > nGlobalPercent )
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 9faa533..3d6d83a 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -94,8 +94,9 @@ private:
SV_DECL_IMPL_REF( ScRangeList );
-// RangePairList: erster Range (aRange[0]) eigentlicher Range, zweiter
-// Range (aRange[1]) Daten zu diesem Range, z.B. Rows eines ColName
+// RangePairList:
+// aRange[0]: actual range,
+// aRange[1]: data for that range, e.g. Rows belonging to a ColName
class SC_DLLPUBLIC ScRangePairList : public SvRefBase
{
public:
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 261c235..ae144bb 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -76,7 +76,7 @@ private:
RangeType eType;
ScDocument* pDoc;
USHORT nIndex;
- BOOL bModified; // wird bei UpdateReference gesetzt/geloescht
+ BOOL bModified; // is set/cleared by UpdateReference
// max row and column to use for wrapping of references. If -1 use the
// application's default.
@@ -102,7 +102,7 @@ public:
SC_DLLPUBLIC ScRangeData( ScDocument* pDoc,
const String& rName,
const ScAddress& rTarget );
- // rTarget ist ABSPOS Sprungmarke
+ // rTarget is ABSPOS jump label
ScRangeData(const ScRangeData& rScRangeData);
SC_DLLPUBLIC virtual ~ScRangeData();
@@ -116,7 +116,7 @@ public:
const String& GetName( void ) const { return aName; }
const String& GetUpperName( void ) const { return aUpperName; }
ScAddress GetPos() const { return aPos; }
- // Der Index muss eindeutig sein. Ist er 0, wird ein neuer Index vergeben
+ // The index has to be unique. If index=0 a new index value is assigned.
void SetIndex( USHORT nInd ) { nIndex = nInd; }
USHORT GetIndex() const { return nIndex; }
ScTokenArray* GetCode() { return pCode; }
@@ -189,7 +189,7 @@ public:
ScDocument* pDocument = NULL) :
ScSortedCollection ( nLim, nDel, bDup ),
pDoc ( pDocument ),
- nSharedMaxIndex ( 1 ) {} // darf nicht 0 sein!!
+ nSharedMaxIndex ( 1 ) {} // must not be 0!!
ScRangeName(const ScRangeName& rScRangeName, ScDocument* pDocument);
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index 6e0ff9b..48aae61 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -297,7 +297,7 @@ public:
//------------------------------------------------------------------------
//
-// gibt Bereiche mit Referenz und alle DB-Bereiche zurueck
+// returns areas with reference and all db-areas
//
class SC_DLLPUBLIC ScAreaNameIterator
diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx
index 575fb30..dc3aea3 100644
--- a/sc/inc/rechead.hxx
+++ b/sc/inc/rechead.hxx
@@ -31,14 +31,14 @@
#include <tools/stream.hxx>
-// ID's fuer Dateien:
+// ID's for files:
#define SCID_SIZES 0x4200
#define SCID_POOLS 0x4210
#define SCID_DOCPOOL 0x4211
#define SCID_STYLEPOOL 0x4212
-#define SCID_NEWPOOLS 0x4213 // ID fuer SC 3.0a
+#define SCID_NEWPOOLS 0x4213 // ID for SC 3.0a
#define SCID_EDITPOOL 0x4214
#define SCID_DOCUMENT 0x4220
@@ -54,7 +54,7 @@
#define SCID_VIEWOPTIONS 0x422a
#define SCID_PRINTSETUP 0x422b
#define SCID_CHARSET 0x422c
-#define SCID_NEWDOCUMENT 0x422d // ID fuer SC 3.0a
+#define SCID_NEWDOCUMENT 0x422d // ID for SC 3.0a
#define SCID_DDELINKS 0x422e
#define SCID_AREALINKS 0x422f
#define SCID_CONDFORMATS 0x4230
@@ -82,36 +82,34 @@
-// Dateiversion
-// Falls das obere Byte inkrementiert wird, wird das Doc von
-// aelteren SCs nicht mehr geladen!
-
+// file version
+// if the high-byte is incremented, the document won't be opened by older SCs
#define SC_INITIAL_VERSION 0x0001
-#define SC_FORMULA_LCLVER 0x0002 // Formalen mit lokaler VerNr
+#define SC_FORMULA_LCLVER 0x0002 // formula with local version no.
//--------------------------------
-#define SC_NEW_TOKEN_ARRAYS 0x0003 // neues TokenArray-Format
-#define SC_FORMULA_VALUES 0x0004 // Werte in Formelzellen
-#define SC_FORMULA_VALUES2 0x0005 // Werte in Formelzellen
-#define SC_DATABYTES 0x0006 // Datenbytes, kleine Tables
-#define SC_DATABYTES2 0x0007 // Datenbytes, kleine Tables
-#define SC_NUMFMT 0x0008 // Zahlenformat an Formelzelle
-#define SC_NEWIF 0x0009 // neue Codierung von ocIf (komp.)
+#define SC_NEW_TOKEN_ARRAYS 0x0003 // new TokenArray format
+#define SC_FORMULA_VALUES 0x0004 // values in formula cells
+#define SC_FORMULA_VALUES2 0x0005 // values in formula cells
+#define SC_DATABYTES 0x0006 // data bytes, small tables
+#define SC_DATABYTES2 0x0007 // data bytes, small tables
+#define SC_NUMFMT 0x0008 // number format of formula cell
+#define SC_NEWIF 0x0009 // new coding of ocIf (komp.)
//--------------------------------
-#define SC_RELATIVE_REFS 0x0010 // relative Referenzen
-#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal der Formelzelle
-#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges als ScRangePair
+#define SC_RELATIVE_REFS 0x0010 // relative references
+#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal of formula cell
+#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges as ScRangePair
//--------------------------------
-#define SC_31_EXPORT_VER 0x0012 // Version bei 3.1-Export
+#define SC_31_EXPORT_VER 0x0012 // version for 3.1-export
//-------------------------------- ab 4.0
-#define SC_32K_ROWS 0x0100 // 32000 Zeilen - inkompatibel
-#define SC_FONTCHARSET 0x0101 // Font-CharSets muessen stimmen
+#define SC_32K_ROWS 0x0100 // 32000 rows - incompatibel
+#define SC_FONTCHARSET 0x0101 // Font-CharSets have to be right
//--------------------------------
-#define SC_40_EXPORT_VER 0x0101 // Version bei 4.0-Export
+#define SC_40_EXPORT_VER 0x0101 // version for 4.0-Export
//-------------------------------- ab 5.0
#define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode
-#define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implizite Schnittmenge
-#define SC_VERSION_EDITPOOL 0x0203 // EditCells mit EditPool
-#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal der Formelzelle wirklich
+#define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implicit intersection
+#define SC_VERSION_EDITPOOL 0x0203 // EditCells with EditPool
+#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal of formula cell (true)
//-------------------------------- ab 5.2
#define SC_CONVERT_RECALC_ON_LOAD 0x0205 // #73616# CONVERT function recalculated on each load
//--------------------------------
More information about the Libreoffice-commits
mailing list