[Libreoffice-commits] core.git: sc/source
Christian M. Heller
christian.heller63 at gmail.com
Sun Oct 5 23:39:17 PDT 2014
sc/source/filter/inc/excdoc.hxx | 2
sc/source/filter/inc/excform.hxx | 4 -
sc/source/filter/inc/expbase.hxx | 14 +--
sc/source/filter/inc/htmlexp.hxx | 20 ++---
sc/source/filter/inc/imp_op.hxx | 16 ++--
sc/source/filter/inc/lotform.hxx | 38 +++++-----
sc/source/filter/inc/namebuff.hxx | 14 +--
sc/source/filter/inc/rtfexp.hxx | 2
sc/source/filter/inc/scflt.hxx | 138 +++++++++++++++++++-------------------
sc/source/filter/inc/tokstack.hxx | 66 +++++++++---------
10 files changed, 157 insertions(+), 157 deletions(-)
New commits:
commit d7646a56c3555bae8ade3f996f2037472160f90c
Author: Christian M. Heller <christian.heller63 at gmail.com>
Date: Sat Oct 4 06:28:02 2014 -0400
fdo#39468 Translate German Comments - sc/source/filter/inc/
Change-Id: I26eacb2f8ab02c788e82aa6fdcb76d8fa07f64fb
Reviewed-on: https://gerrit.libreoffice.org/11803
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index dc606b6..6188033 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -56,7 +56,7 @@ private:
XclExpNoteListRef mxNoteList;
- // pRec mit new anlegen und vergessen, delete macht ExcTable selber!
+ // re-create and forget pRec; delete is done by ExcTable itself!
void Add( XclExpRecordBase* pRec );
public:
diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx
index e057420..59e933f 100644
--- a/sc/source/filter/inc/excform.hxx
+++ b/sc/source/filter/inc/excform.hxx
@@ -35,9 +35,9 @@ protected:
enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA };
typedef ::std::vector< ExtensionType > ExtensionTypeVec;
- bool bExternName; // wenn External Name gefunden wurde
+ bool bExternName; // external name was found
static const sal_uInt16 nRowMask;
- static const sal_uInt16 nLastInd; // letzter Index fuer Excel->SC-
+ static const sal_uInt16 nLastInd; // last Index for Excel->SC-
// Token Umsetzung
XclFunctionProvider maFuncProv;
const XclBiff meBiff;
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index 2757113..e564e14 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -41,19 +41,19 @@ public:
ScExportBase( SvStream&, ScDocument*, const ScRange& );
virtual ~ScExportBase();
- // Hidden Cols/Rows an den Raendern trimmen,
- // return: sal_True wenn Bereich vorhanden
- // Start/End/Col/Row muessen gueltige Ausgangswerte sein
+ // Trim borders of hidden Cols/Rows,
+ // return: sal_True if range exists
+ // Start/End/Col/Row must have valid starting values
bool TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const;
- // Ausgabebereich einer Tabelle ermitteln,
- // Hidden Cols/Rows an den Raendern beruecksichtigt,
- // return: sal_True wenn Bereich vorhanden
+ // Get Data Area of a table,
+ // adjust borders of hidden Cols/Rows,
+ // return: sal_True if range exists
bool GetDataArea( SCTAB nTab, SCCOL& nStartCol,
SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const;
- // Tabelle nicht vorhanden oder leer
+ // table does not exist or is empty
bool IsEmptyTable( SCTAB nTab ) const;
ScFieldEditEngine& GetEditEngine() const;
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 6120906..c895d03 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -70,11 +70,11 @@ struct ScHTMLStyle
struct ScHTMLGraphEntry
{
- ScRange aRange; // ueberlagerter Zellbereich
- Size aSize; // Groesse in Pixeln
- Size aSpace; // Spacing in Pixeln
+ ScRange aRange; // mapped range
+ Size aSize; // size in pixels
+ Size aSpace; // spacing in pixels
SdrObject* pObject;
- bool bInCell; // ob in Zelle ausgegeben wird
+ bool bInCell; // if output is in cell
bool bWritten;
ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange,
@@ -109,15 +109,15 @@ class ScHTMLExport : public ScExportBase
OUString aBaseURL;
OUString aStreamPath;
OUString aFilterOptions;
- OUString aCId; // Content-Id fuer Mail-Export
- OutputDevice* pAppWin; // fuer Pixelei
- FileNameMapPtr pFileNameMap; // fuer CopyLocalFileToINet
+ OUString aCId; // Content-Id for Mail-Export
+ OutputDevice* pAppWin; // for Pixel-work
+ FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet
OUString aNonConvertibleChars; // collect nonconvertible characters
rtl_TextEncoding eDestEnc;
SCTAB nUsedTables;
short nIndent;
sal_Char sIndent[nIndentMax+1];
- bool bAll; // ganzes Dokument
+ bool bAll; // whole document
bool bTabHasGraphics;
bool bTabAlignedLeft;
bool bCalcAsShown;
@@ -139,12 +139,12 @@ class ScHTMLExport : public ScExportBase
void WriteImage( OUString& rLinkName,
const Graphic&, const OString& rImgOptions,
sal_uLong nXOutFlags = 0 );
- // nXOutFlags fuer XOutBitmap::WriteGraphic
+ // nXOutFlags for XOutBitmap::WriteGraphic
// write to stream if and only if URL fields in edit cell
bool WriteFieldText( const EditTextObject* pData );
- // kopiere ggfs. eine lokale Datei ins Internet
+ // copy a local file to internet if needed
bool CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm, bool bFileToFile = false );
bool HasCId()
{
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index f492390..5fd69bc 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -46,8 +46,8 @@ class ExcelToSc;
class ImportTyp
{
protected:
- rtl_TextEncoding eQuellChar; // Quell-Zeichensatz
- ScDocument* pD; // Dokument
+ rtl_TextEncoding eQuellChar; // source (Quelle) character set
+ ScDocument* pD; // document
public:
ImportTyp( ScDocument*, rtl_TextEncoding eSrc );
@@ -90,7 +90,7 @@ protected:
};
typedef boost::unordered_map<SCCOL, LastFormula> LastFormulaMapType;
- static const double fExcToTwips; // Umrechnung 1/256 Zeichen -> Twips
+ static const double fExcToTwips; // translate 1/256 chars -> Twips
RootData* pExcRoot;
@@ -105,7 +105,7 @@ protected:
XclImpOutlineBuffer* pColOutlineBuff;
XclImpOutlineBuffer* pRowOutlineBuff;
- XclImpColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle
+ XclImpColRowSettings* pColRowBuff; // Col/Row settings 1 table
typedef boost::ptr_vector< XclImpOutlineDataBuffer > XclImpOutlineListBuffer;
XclImpOutlineListBuffer* pOutlineListBuffer;
@@ -117,17 +117,17 @@ protected:
sal_uInt16 mnIxfeIndex; /// Current XF identifier from IXFE record.
sal_uInt16 mnLastRecId;
- SCTAB nBdshtTab; // Counter fuer Boundsheet
+ SCTAB nBdshtTab; // Counter for Boundsheet
- bool bTabTruncated; // wenn Bereichsueberschreitung zum
- // Abschneiden von Zellen fuehrt
+ bool bTabTruncated; // if extended range leads to
+ // truncation of cells
bool mbBiff2HasXfs:1; /// Select XF formatting or direct formatting in BIFF2.
bool mbBiff2HasXfsValid:1; /// False = mbBiff2HasXfs is undetermined yet.
void SetLastFormula( SCCOL nCol, SCROW nRow, double fVal, sal_uInt16 nXF, ScFormulaCell* pCell );
- // Record-Funktionen
+ // Record functions
void ReadFileSharing();
sal_uInt16 ReadXFIndex( const ScAddress& rScPos, bool bBiff2 );
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index 4c3165d..427e84f 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -26,34 +26,34 @@
enum FUNC_TYPE
{
FT_Return = 0, // End Formula
- FT_FuncFix0, // Funktion, 0 Parameter
- FT_FuncFix1, // Funktion, 0 Parameter
- FT_FuncFix2, // Funktion, 0 Parameter
- FT_FuncFix3, // Funktion, 0 Parameter
- FT_FuncFix4, // Funktion, 0 Parameter
+ FT_FuncFix0, // Function, 0 Parameter
+ FT_FuncFix1, // Function, 0 Parameter
+ FT_FuncFix2, // Function, 0 Parameter
+ FT_FuncFix3, // Function, 0 Parameter
+ FT_FuncFix4, // Function, 0 Parameter
FT_FuncVar, // ~, var. P.
- FT_Neg, // Negierung
+ FT_Neg, // Negation
FT_Op, // Operator
- FT_NotImpl, // nicht implementiert
+ FT_NotImpl, // not implemented
FT_ConstFloat, // Double (8-Byte)
FT_Variable, // Single Ref
FT_Range, // Double Ref
- FT_Braces, // Klammmern
+ FT_Braces, // Braces
FT_ConstInt, // Integer
FT_ConstString, // String
- FT_NOP, // nichts
- // zusaetzlich ab WK3
+ FT_NOP, // nothing
+ // additionally since WK3
FT_Cref, // Cell Reference
FT_Rref, // Range Reference
FT_Nrref, // Named range reference
- FT_Absnref, // Absolut named range
+ FT_Absnref, // Absolute named range
FT_Erref, // Err range reference
FT_Ecref, // Err cell reference
FT_Econstant, // Err constant
FT_Splfunc, // SPLfunction
FT_Const10Float,// Float (10-Byte)
FT_Snum // Const Short Num
- // fuer 'Problemfaelle' beim Import
+ // for 'Problem Cases' during Import
};
struct LotusContext;
@@ -73,19 +73,19 @@ private:
static DefTokenId IndexToTokenWK123( sal_uInt8 );
void DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtName );
void LotusRelToScRel(sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefData& rSRD);
- bool bWK3; // alternative Codeumsetzung statt fuer < WK1
+ bool bWK3; // alternative Code translation for < WK1
bool bWK123; // alternative for 123
void ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nFlags );
inline void ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nFlags );
void IncToken( TokenId &rParam );
- // ACHTUNG: hier wird die aktuelle Token-Kette im Pool
- // mit '(<rParam>)+1' fortgeschrieben und mit
- // Store() abgeschlossen!
+ // Attention: here the Token-chain is extended in Pool
+ // with '(<rParam>)+1' and finished with Store() !
+
void DecToken( TokenId& rParam );
// ACHTUNG: ~
void NegToken( TokenId& rParam );
- // ACHTUNG: wie ~, nur wird '-(<rParam>)' gebildet
+ // ACHTUNG: like ~, but with '-(<rParam>)'
public:
LotusToSc(LotusContext &rContext, SvStream& aStr, svl::SharedStringPool& rSPool, rtl_TextEncoding eSrc, bool b);
@@ -102,10 +102,10 @@ private:
inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit )
{
- // erster Teil
+ // 1st part
ReadSRD( rCRD.Ref1, nRelBit );
- // zweiter Teil
+ // 2nd part
ReadSRD( rCRD.Ref2, nRelBit >> 3 );
}
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index cf3bc90..53ee81c 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -86,7 +86,7 @@ inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const
class NameBuffer : public ExcRoot
{
private:
- sal_uInt16 nBase; // Index-Basis
+ sal_uInt16 nBase; // Index-Base
std::vector<StringHashEntry*> maHashes;
public:
@@ -157,7 +157,7 @@ private:
StringHashEntry aStrHashEntry;
ScComplexRefData aScComplexRefDataRel;
OUString aScAbsName;
- sal_uInt16 nAbsInd; // == 0 -> noch keine Abs-Name!
+ sal_uInt16 nAbsInd; // == 0 -> no Abs-Name yet!
sal_uInt16 nRelInd;
bool bSingleRef;
Entry( const OUString& rName, const OUString& rScName, const ScComplexRefData& rCRD )
@@ -209,16 +209,16 @@ private:
{
OUString aFile;
OUString aTab;
- sal_uInt16 nTabNum; // 0xFFFF -> noch nicht angelegt
- // 0xFFFE -> versucht anzulegen, ging aber schief
- // 0xFFFD -> soll im selben Workbook sein, findet's aber nicht
+ sal_uInt16 nTabNum; // 0xFFFF -> not set yet
+ // 0xFFFE -> tried to set, but failed
+ // 0xFFFD -> should be in the same workbook, but not found
bool bSWB;
bool bLink;
Cont( const OUString& rFilePathAndName, const OUString& rTabName ) :
aFile( rFilePathAndName ),
aTab( rTabName )
{
- nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt
+ nTabNum = 0xFFFF; // -> table not created yet
bSWB = bLink = false;
}
Cont( const OUString& rFilePathAndName, const OUString& rTabName,
@@ -226,7 +226,7 @@ private:
aFile( rFilePathAndName ),
aTab( rTabName )
{
- nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt
+ nTabNum = 0xFFFF; // -> table not created yet
bSWB = bSameWB;
bLink = false;
}
diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx
index 32eb332..73ab85d 100644
--- a/sc/source/filter/inc/rtfexp.hxx
+++ b/sc/source/filter/inc/rtfexp.hxx
@@ -24,7 +24,7 @@
class ScRTFExport : public ScExportBase
{
- sal_uLong* pCellX; // kumulierte Zellbreiten einer Tabelle
+ sal_uLong* pCellX; // cumulative range in a table
void WriteTab( SCTAB nTab );
void WriteRow( SCTAB nTab, SCROW nRow );
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index e117a5f..b073a09 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -151,29 +151,29 @@
#define pfProtection 0x20
// Displayflags fuer die Tabelle
-#define dfFormula 0x0001 // Formeln
-#define dfZerro 0x0002 // Nullwerte
-#define dfGrid 0x0004 // Gitternetz
-#define dfPageBreak 0x0008 // Seitenumbruch
-#define dfColRowBar 0x0010 // Zeilen/Spalten Koepfe (Dummy)
+#define dfFormula 0x0001 // formula
+#define dfZerro 0x0002 // zero values
+#define dfGrid 0x0004 // grid
+#define dfPageBreak 0x0008 // PageBreak
+#define dfColRowBar 0x0010 // Row/Col heads (Dummy)
#define dfSyntax 0x0020 // Syntax Highlighting
-#define dfPrintPage 0x0040 // Druckbildansicht (Dummy)
-#define dfObjectAll 0x0080 // Objekte anzeigen
-#define dfObjectFrame 0x0100 // Objekte als Platzhalter
-#define dfObjectNone 0x0200 // Objekte nicht anzeigen
-#define dfNoteMark 0x0400 // Notizanzeiger
-#define dfProtectMark 0x0800 // Schutzanzeiger
+#define dfPrintPage 0x0040 // PrintView (Dummy)
+#define dfObjectAll 0x0080 // show objects
+#define dfObjectFrame 0x0100 // objects as place holder
+#define dfObjectNone 0x0200 // do not show objects
+#define dfNoteMark 0x0400 // NoteMark
+#define dfProtectMark 0x0800 // ProtectMark
// Objekt Typen
-#define otNone 0 // s.u.
+#define otNone 0 // see below
#define otOle 1
#define otImage 2
#define otChart 3
// Grafik Typen
-#define gtNone 0 // Kann nicht vorkommen
-#define gtOle 1 // Ole 1.0 Objekt
-#define gtImage 2 // Image (Bitmap oder Metafile)
+#define gtNone 0 // not possible
+#define gtOle 1 // Ole 1.0 Object
+#define gtImage 2 // Image (Bitmap or Metafile)
#define gtChart 3 // Chart
// Datum/Uhrzeit
@@ -190,8 +190,8 @@ struct Sc10DateTime
// ZahlenFormate
struct Sc10ValueFormat
{
- sal_uInt8 Format; // Zahl, Waehrung, Prozent etc.
- sal_uInt8 Info; // Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat
+ sal_uInt8 Format; // number, currency, percentage,...
+ sal_uInt8 Info; // number of decimals, or positions, or Date/Time format
Sc10ValueFormat()
: Format(0)
, Info(0)
@@ -255,7 +255,7 @@ struct Sc10Color
}
};
-// Blockbeschreibung
+// Block definition
struct Sc10BlockRect
{
sal_Int16 x1;
@@ -271,7 +271,7 @@ struct Sc10BlockRect
}
};
-// Datenbank-Bereich
+// Data range
struct Sc10DataBaseRec
{
sal_Char Name[32];
@@ -334,7 +334,7 @@ struct Sc10DataBaseRec
}
};
-// Kopf/Fusszeilen-Beschreibung
+// Header/Footer
struct Sc10HeadFootLine
{
sal_Char Title[128];
@@ -346,13 +346,13 @@ struct Sc10HeadFootLine
Sc10Color TextColor;
Sc10Color BackColor;
Sc10Color RasterColor;
- sal_uInt16 FrameColor; // Nibble Codierte Farben link oben rechts unten
+ sal_uInt16 FrameColor; // Nibble coded colors left-top right-bottom
sal_uInt16 Reserved;
bool operator==( const Sc10HeadFootLine& rData ) const;
};
-// Seitenformat
+// page format
struct Sc10PageFormat
{
Sc10HeadFootLine HeadLine;
@@ -376,7 +376,7 @@ struct Sc10PageFormat
sal_uInt8 TopBottomDir;
sal_Char PrintAreaName[32];
Sc10BlockRect PrintArea;
- sal_Char PrnZoom[6]; // Pascal 6 Byte Realzahl
+ sal_Char PrnZoom[6]; // Pascal 6 Byte RealNumber
SCTAB FirstPageNo;
sal_Int16 RowRepeatStart;
sal_Int16 RowRepeatEnd;
@@ -387,7 +387,7 @@ struct Sc10PageFormat
bool operator==( const Sc10PageFormat& rData ) const;
};
-// Tabellenschutz
+// Table protection
struct Sc10TableProtect
{
sal_Char PassWord[16];
@@ -395,7 +395,7 @@ struct Sc10TableProtect
sal_uInt8 Protect;
};
-// Documentschutz
+// Document protection
struct Sc10SheetProtect
{
sal_Char PassWord[16];
@@ -409,7 +409,7 @@ struct Sc10SheetProtect
}
};
-// Dateikopf StarCalc 1.0 Datei
+// FileHeader StarCalc 1.0 Datei
struct Sc10FileHeader
{
sal_Char CopyRight[30];
@@ -417,7 +417,7 @@ struct Sc10FileHeader
sal_Char Reserved[32];
};
-// Benutzer-Definierte Datei-Beschreibung
+// User-Defined File Definition
struct Sc10FileInfo
{
sal_Char Title[64];
@@ -451,30 +451,30 @@ struct Sc10FileInfo
sal_Char Reserved[52];
};
-// Letze Cursorposition
+// Last Cursor position
struct Sc10EditStateInfo
{
// Cursor Position
sal_uInt16 CarretX;
sal_uInt16 CarretY;
sal_uInt16 CarretZ;
- // Linke obere Ecke der Tabelle im Fenster
+ // left-top corner of the table
sal_uInt16 DeltaX;
sal_uInt16 DeltaY;
sal_uInt16 DeltaZ;
- // Ueberfluessig in StarCalc 3.0
+ // redundant in StarCalc 3.0
sal_uInt8 DataBaseMode;
sal_Char Reserved[51];
};
-// Attribut-Eintrag
+// Attribut entry
struct Sc10ColData
{
sal_uInt16 Row;
sal_uInt16 Value;
};
-// ZellAttribut-Beschreibung
+// Cell-Attribute definition
struct Sc10ColAttr
{
sal_uInt16 Count;
@@ -491,68 +491,68 @@ struct Sc10ColAttr
// GraphHeader
struct Sc10GraphHeader
{
- sal_uInt8 Typ; // Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object)
- sal_Int16 CarretX; // ZellPosition der Grafik
+ sal_uInt8 Typ; // Type of Grafik (Ole-Objekt, Image (Bitmap of MetaFile), Chart-Object)
+ sal_Int16 CarretX; // Cell Position of Grafik
sal_Int16 CarretY;
sal_Int16 CarretZ;
- sal_Int32 x; // x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege)
+ sal_Int32 x; // x,y distance to cell border in pixels (pixels, as Grafics are stored in window)
sal_Int32 y;
- sal_Int32 w; // w,h Breite und Hoehe in Pixel
+ sal_Int32 w; // w,h width and height in pixels
sal_Int32 h;
- sal_uInt8 IsRelPos; // Ist die Position relativ zur Zelle oder absolute in der Tabelle
- sal_uInt8 DoPrint; // Soll die Grafik ausgedruckt werden
- sal_uInt16 FrameType; // Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick)
- sal_uInt8 IsTransparent; // Soll der Hintergrund gezeichnet werden
- Sc10Color FrameColor; // Umrandungsfarbe als RGB-Wert
- Sc10Color BackColor; // Hintergrundfarbe als RGB-Wert
- sal_Char Reserved[32]; // Na was wohl
+ sal_uInt8 IsRelPos; // position relativ to cell, or absolute in the table
+ sal_uInt8 DoPrint; // print Grafic?
+ sal_uInt16 FrameType; // Frame type around Grafic (none, simple, double, simple thick, double thick)
+ sal_uInt8 IsTransparent; // show background?
+ Sc10Color FrameColor; // FrameColor as RGB value
+ Sc10Color BackColor; // BackGroundColor as RGB value
+ sal_Char Reserved[32]; // Reserved
};
// ImageHeader
struct Sc10ImageHeader
{
- sal_Char FileName[128]; // Dateiname des urspruenglich eingefuegten Bildes
- sal_Int16 Typ; // Typ der Grafik (Bitmap oder Metafile)
- sal_uInt8 Linked; // Kann nicht vorkommen
- sal_Int16 x1; // Urspruengliche Groesse der Grafik (nur fuer Metafiles)
+ sal_Char FileName[128]; // file name of the original inserted image
+ sal_Int16 Typ; // image type (Bitmap or Metafile)
+ sal_uInt8 Linked; // not possible
+ sal_Int16 x1; // original image size (only for Metafiles)
sal_Int16 y1;
sal_Int16 x2;
sal_Int16 y2;
- sal_uInt32 Size; // Groesse der Grafik in BYTES
+ sal_uInt32 Size; // image size in BYTES
};
// ChartHeader
struct Sc10ChartHeader
{
- sal_Int16 MM; // Meatfile Struktur MapMode, Breite, Hoehe
+ sal_Int16 MM; // Meatfile structure MapMode, Width, Hight
sal_Int16 xExt;
sal_Int16 yExt;
- sal_uInt32 Size; // Groesse der Grafik in BYTES
+ sal_uInt32 Size; // image size in BYTES
};
// ChartSheetData
struct Sc10ChartSheetData
{
- sal_uInt8 HasTitle; // Hat das Chart Daten aus der Tabell fuer einen Titel
- sal_Int16 TitleX; // Zellposition des Titels
+ sal_uInt8 HasTitle; // has the Chart a title in the table
+ sal_Int16 TitleX; // cell position of title
sal_Int16 TitleY;
- sal_uInt8 HasSubTitle; // Hat das Chart Daten aus der Tabell fuer einen Untertitel
- sal_Int16 SubTitleX; // Zellposition des Untertitels
+ sal_uInt8 HasSubTitle; // has the Chart a sub-title in the table
+ sal_Int16 SubTitleX; // cell position of sub-title
sal_Int16 SubTitleY;
- sal_uInt8 HasLeftTitle; // Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel
- sal_Int16 LeftTitleX; // Zellposition des Linken-Titels
+ sal_uInt8 HasLeftTitle; // has the Chart a left-title in the table
+ sal_Int16 LeftTitleX; // cell position of left-title
sal_Int16 LeftTitleY;
- sal_uInt8 HasLegend; // Hat das Chart Daten aus der Tabelle fuer eine Legende
- sal_Int16 LegendX1; // Zellen der Legende
+ sal_uInt8 HasLegend; // has the Chart a legend in the table
+ sal_Int16 LegendX1; // cells for legend
sal_Int16 LegendY1;
sal_Int16 LegendX2;
sal_Int16 LegendY2;
- sal_uInt8 HasLabel; // Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung
- sal_Int16 LabelX1; // Zellen der Achsbeschriftung
+ sal_uInt8 HasLabel; // has the Chart axis labels in the table
+ sal_Int16 LabelX1; // cells for axis labels
sal_Int16 LabelY1;
sal_Int16 LabelX2;
sal_Int16 LabelY2;
- sal_Int16 DataX1; // Zellen der Daten
+ sal_Int16 DataX1; // cells for Data
sal_Int16 DataY1;
sal_Int16 DataX2;
sal_Int16 DataY2;
@@ -626,7 +626,7 @@ private:
using ScCollection::At;
};
-//BereichsDaten
+//Range-Data
class Sc10NameData : public ScDataObject
{
public :
@@ -647,7 +647,7 @@ public :
virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10NameData(*this); }
};
-// Bereichs-Collection
+// Range-Collection
class Sc10NameCollection : public ScCollection
{
protected:
@@ -660,7 +660,7 @@ private:
using ScCollection::At;
};
-// Vorlage-Daten
+// Template-Data
class Sc10PatternData : public ScDataObject
{
public:
@@ -698,7 +698,7 @@ public:
virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10PatternData(*this); }
};
-// Vorlage-Collection
+// Template-Collection
class Sc10PatternCollection : public ScCollection
{
protected:
@@ -711,7 +711,7 @@ private:
using ScCollection::At;
};
-// DatenBank-Daten
+// DataBank-Data
class Sc10DataBaseData : public ScDataObject
{
public:
@@ -726,7 +726,7 @@ public:
virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10DataBaseData(*this); }
};
-// DatenBank-Collection
+// DataBank-Collection
class Sc10DataBaseCollection : public ScCollection
{
protected:
@@ -750,7 +750,7 @@ public:
virtual ScDataObject* Clone() const SAL_OVERRIDE;
};
-// Seitenformat-Collection
+// PageFormat-Collection
class Sc10PageCollection : public ScCollection
{
public:
@@ -764,7 +764,7 @@ private:
class ScfStreamProgressBar;
-// Import-Klasse
+// Import-Class
class Sc10Import
{
SvStream& rStream;
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 95d6e6d..cf75c9f 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -67,27 +67,27 @@ enum E_TYPE
T_RefC, // Cell Reference
T_RefA, // Area Reference
T_RN, // Range Name
- T_Ext, // irgendwas Unbekanntes mit Funktionsnamen
+ T_Ext, // something unknown with function name
T_Nlf, // token for natural language formula
T_Matrix, // token for inline arrays
T_ExtName, // token for external names
T_ExtRefC,
T_ExtRefA,
- T_Error // fuer Abfrage im Fehlerfall
+ T_Error // for check in case of error
};
class TokenPool
{
- // !ACHTUNG!: externe Id-Basis ist 1, interne 0!
- // Ausgabe Id = 0 -> Fehlerfall
+ // !ATTENTION!: external Id-Basis is 1, internal 0!
+ // return Id = 0 -> Error
private:
svl::SharedStringPool& mrStringPool;
- OUString** ppP_Str; // Pool fuer Strings
- sal_uInt16 nP_Str; // ...mit Groesse
- sal_uInt16 nP_StrAkt; // ...und Schreibmarke
+ OUString** ppP_Str; // Pool for Strings
+ sal_uInt16 nP_Str; // ...with size
+ sal_uInt16 nP_StrAkt; // ...and Write-Mark
- double* pP_Dbl; // Pool fuer Doubles
+ double* pP_Dbl; // Pool for Doubles
sal_uInt16 nP_Dbl;
sal_uInt16 nP_DblAkt;
@@ -95,14 +95,14 @@ private:
sal_uInt16 nP_Err;
sal_uInt16 nP_ErrAkt;
- ScSingleRefData** ppP_RefTr; // Pool fuer Referenzen
+ ScSingleRefData** ppP_RefTr; // Pool for References
sal_uInt16 nP_RefTr;
sal_uInt16 nP_RefTrAkt;
- sal_uInt16* pP_Id; // Pool fuer Id-Folgen
+ sal_uInt16* pP_Id; // Pool for Id-sets
sal_uInt16 nP_Id;
sal_uInt16 nP_IdAkt;
- sal_uInt16 nP_IdLast; // letzter Folgen-Beginn
+ sal_uInt16 nP_IdLast; // last set-start
struct EXTCONT
{
@@ -124,7 +124,7 @@ private:
sal_uInt16 nP_Nlf;
sal_uInt16 nP_NlfAkt;
- ScMatrix** ppP_Matrix; // Pool fuer Matricies
+ ScMatrix** ppP_Matrix; // Pool for Matrices
sal_uInt16 nP_Matrix;
sal_uInt16 nP_MatrixAkt;
@@ -162,13 +162,13 @@ private:
};
::std::vector<ExtAreaRef> maExtAreaRefs;
- sal_uInt16* pElement; // Array mit Indizes fuer Elemente
- E_TYPE* pType; // ...mit Typ-Info
- sal_uInt16* pSize; // ...mit Laengenangabe (Anz. sal_uInt16)
+ sal_uInt16* pElement; // Array with Indices for elements
+ E_TYPE* pType; // ...with Typ-Info
+ sal_uInt16* pSize; // ...with size (Anz. sal_uInt16)
sal_uInt16 nElement;
sal_uInt16 nElementAkt;
- static const sal_uInt16 nScTokenOff;// Offset fuer SC-Token
+ static const sal_uInt16 nScTokenOff;// Offset for SC-Token
#ifdef DBG_UTIL
sal_uInt16 m_nRek; // recursion counter
#endif
@@ -199,7 +199,7 @@ public:
inline const TokenId Store( void );
const TokenId Store( const double& rDouble );
- // nur fuer Range-Names
+ // only for Range-Names
const TokenId Store( const sal_uInt16 nIndex );
inline const TokenId Store( const sal_Int16 nWert );
const TokenId Store( const OUString& rString );
@@ -207,7 +207,7 @@ public:
const TokenId Store( const ScComplexRefData& rTr );
const TokenId Store( const DefTokenId eId, const OUString& rName );
- // 4 externals (e.g. AddIns, Makros...)
+ // 4 externals (e.g. AddIns, Macros...)
const TokenId StoreNlf( const ScSingleRefData& rTr );
const TokenId StoreMatrix();
const TokenId StoreName( sal_uInt16 nIndex, bool bGlobal );
@@ -225,13 +225,13 @@ public:
};
class TokenStack
- // Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als
- // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert
+ // Stack for Token-Ids: reserve Id=0 for error; e.g. Get() returns 0 on error
+
{
private:
- TokenId* pStack; // Stack als Array
- sal_uInt16 nPos; // Schreibmarke
- sal_uInt16 nSize; // Erster Index ausserhalb des Stacks
+ TokenId* pStack; // Stack as Array
+ sal_uInt16 nPos; // Write-mark
+ sal_uInt16 nSize; // first Index outside of stack
public:
TokenStack( sal_uInt16 nNewSize = 1024 );
~TokenStack();
@@ -247,7 +247,7 @@ class TokenStack
inline const TokenId TokenStack::Get( void )
{
OSL_ENSURE( nPos > 0,
- "*TokenStack::Get(): Leer ist leer, ist leer, ist leer, ist..." );
+ "*TokenStack::Get(): is empty, is empty, ..." );
TokenId nRet;
@@ -263,7 +263,7 @@ inline const TokenId TokenStack::Get( void )
}
inline TokenStack &TokenStack::operator <<( const TokenId nNewId )
-{// Element auf Stack
+{// Element on Stack
OSL_ENSURE( nPos < nSize, "*TokenStack::<<(): Stack overflow" );
if( nPos < nSize )
{
@@ -275,9 +275,9 @@ inline TokenStack &TokenStack::operator <<( const TokenId nNewId )
}
inline void TokenStack::operator >>( TokenId& rId )
-{// Element von Stack
+{// Element of Stack
OSL_ENSURE( nPos > 0,
- "*TokenStack::>>(): Leer ist leer, ist leer, ist leer, ..." );
+ "*TokenStack::>>(): is empty, is empty, ..." );
if( nPos > 0 )
{
nPos--;
@@ -292,11 +292,11 @@ inline void TokenStack::Reset( void )
inline TokenPool& TokenPool::operator <<( const TokenId nId )
{
- // POST: nId's werden hintereinander im Pool unter einer neuen Id
- // abgelegt. Vorgang wird mit >> oder Store() abgeschlossen
+ // POST: nId's are stored consecutively in Pool under a new Id;
+ // finalize with >> or Store()
// nId -> ( sal_uInt16 ) nId - 1;
OSL_ENSURE( ( sal_uInt16 ) nId < nScTokenOff,
- "-TokenPool::operator <<: TokenId im DefToken-Bereich!" );
+ "-TokenPool::operator <<: TokenId in DefToken-Range!" );
if( nP_IdAkt >= nP_Id )
if (!GrowId())
@@ -311,7 +311,7 @@ inline TokenPool& TokenPool::operator <<( const TokenId nId )
inline TokenPool& TokenPool::operator <<( const DefTokenId eId )
{
OSL_ENSURE( ( sal_uInt32 ) eId + nScTokenOff < 0xFFFF,
- "-TokenPool::operator<<: enmum zu gross!" );
+ "-TokenPool::operator<<: enmum too large!" );
if( nP_IdAkt >= nP_Id )
if (!GrowId())
@@ -356,7 +356,7 @@ inline const TokenId TokenPool::Store( const sal_Int16 nWert )
inline const TokenId TokenPool::LastId( void ) const
{
- return ( TokenId ) nElementAkt; // stimmt, da Ausgabe mit Offset 1!
+ return ( TokenId ) nElementAkt; // correct, as Ausgabe with Offset 1!
}
const inline ScTokenArray* TokenPool::operator []( const TokenId nId )
@@ -364,7 +364,7 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId )
pScToken->Clear();
if( nId )
- {//...nur wenn nId > 0!
+ {//...only if nId > 0!
#ifdef DBG_UTIL
m_nRek = 0;
#endif
More information about the Libreoffice-commits
mailing list