Kaydet (Commit) d7646a56 authored tarafından Christian M. Heller's avatar Christian M. Heller Kaydeden (comit) Noel Grandin

fdo#39468 Translate German Comments - sc/source/filter/inc/

Change-Id: I26eacb2f8ab02c788e82aa6fdcb76d8fa07f64fb
Reviewed-on: https://gerrit.libreoffice.org/11803Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst addf5518
...@@ -56,7 +56,7 @@ private: ...@@ -56,7 +56,7 @@ private:
XclExpNoteListRef mxNoteList; 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 ); void Add( XclExpRecordBase* pRec );
public: public:
......
...@@ -35,9 +35,9 @@ protected: ...@@ -35,9 +35,9 @@ protected:
enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA }; enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA };
typedef ::std::vector< ExtensionType > ExtensionTypeVec; 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 nRowMask;
static const sal_uInt16 nLastInd; // letzter Index fuer Excel->SC- static const sal_uInt16 nLastInd; // last Index for Excel->SC-
// Token Umsetzung // Token Umsetzung
XclFunctionProvider maFuncProv; XclFunctionProvider maFuncProv;
const XclBiff meBiff; const XclBiff meBiff;
......
...@@ -41,19 +41,19 @@ public: ...@@ -41,19 +41,19 @@ public:
ScExportBase( SvStream&, ScDocument*, const ScRange& ); ScExportBase( SvStream&, ScDocument*, const ScRange& );
virtual ~ScExportBase(); virtual ~ScExportBase();
// Hidden Cols/Rows an den Raendern trimmen, // Trim borders of hidden Cols/Rows,
// return: sal_True wenn Bereich vorhanden // return: sal_True if range exists
// Start/End/Col/Row muessen gueltige Ausgangswerte sein // Start/End/Col/Row must have valid starting values
bool TrimDataArea( SCTAB nTab, SCCOL& nStartCol, bool TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const; SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const;
// Ausgabebereich einer Tabelle ermitteln, // Get Data Area of a table,
// Hidden Cols/Rows an den Raendern beruecksichtigt, // adjust borders of hidden Cols/Rows,
// return: sal_True wenn Bereich vorhanden // return: sal_True if range exists
bool GetDataArea( SCTAB nTab, SCCOL& nStartCol, bool GetDataArea( SCTAB nTab, SCCOL& nStartCol,
SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const; SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const;
// Tabelle nicht vorhanden oder leer // table does not exist or is empty
bool IsEmptyTable( SCTAB nTab ) const; bool IsEmptyTable( SCTAB nTab ) const;
ScFieldEditEngine& GetEditEngine() const; ScFieldEditEngine& GetEditEngine() const;
......
...@@ -70,11 +70,11 @@ struct ScHTMLStyle ...@@ -70,11 +70,11 @@ struct ScHTMLStyle
struct ScHTMLGraphEntry struct ScHTMLGraphEntry
{ {
ScRange aRange; // ueberlagerter Zellbereich ScRange aRange; // mapped range
Size aSize; // Groesse in Pixeln Size aSize; // size in pixels
Size aSpace; // Spacing in Pixeln Size aSpace; // spacing in pixels
SdrObject* pObject; SdrObject* pObject;
bool bInCell; // ob in Zelle ausgegeben wird bool bInCell; // if output is in cell
bool bWritten; bool bWritten;
ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange, ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange,
...@@ -109,15 +109,15 @@ class ScHTMLExport : public ScExportBase ...@@ -109,15 +109,15 @@ class ScHTMLExport : public ScExportBase
OUString aBaseURL; OUString aBaseURL;
OUString aStreamPath; OUString aStreamPath;
OUString aFilterOptions; OUString aFilterOptions;
OUString aCId; // Content-Id fuer Mail-Export OUString aCId; // Content-Id for Mail-Export
OutputDevice* pAppWin; // fuer Pixelei OutputDevice* pAppWin; // for Pixel-work
FileNameMapPtr pFileNameMap; // fuer CopyLocalFileToINet FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet
OUString aNonConvertibleChars; // collect nonconvertible characters OUString aNonConvertibleChars; // collect nonconvertible characters
rtl_TextEncoding eDestEnc; rtl_TextEncoding eDestEnc;
SCTAB nUsedTables; SCTAB nUsedTables;
short nIndent; short nIndent;
sal_Char sIndent[nIndentMax+1]; sal_Char sIndent[nIndentMax+1];
bool bAll; // ganzes Dokument bool bAll; // whole document
bool bTabHasGraphics; bool bTabHasGraphics;
bool bTabAlignedLeft; bool bTabAlignedLeft;
bool bCalcAsShown; bool bCalcAsShown;
...@@ -139,12 +139,12 @@ class ScHTMLExport : public ScExportBase ...@@ -139,12 +139,12 @@ class ScHTMLExport : public ScExportBase
void WriteImage( OUString& rLinkName, void WriteImage( OUString& rLinkName,
const Graphic&, const OString& rImgOptions, const Graphic&, const OString& rImgOptions,
sal_uLong nXOutFlags = 0 ); sal_uLong nXOutFlags = 0 );
// nXOutFlags fuer XOutBitmap::WriteGraphic // nXOutFlags for XOutBitmap::WriteGraphic
// write to stream if and only if URL fields in edit cell // write to stream if and only if URL fields in edit cell
bool WriteFieldText( const EditTextObject* pData ); 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 CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm, bool bFileToFile = false );
bool HasCId() bool HasCId()
{ {
......
...@@ -46,8 +46,8 @@ class ExcelToSc; ...@@ -46,8 +46,8 @@ class ExcelToSc;
class ImportTyp class ImportTyp
{ {
protected: protected:
rtl_TextEncoding eQuellChar; // Quell-Zeichensatz rtl_TextEncoding eQuellChar; // source (Quelle) character set
ScDocument* pD; // Dokument ScDocument* pD; // document
public: public:
ImportTyp( ScDocument*, rtl_TextEncoding eSrc ); ImportTyp( ScDocument*, rtl_TextEncoding eSrc );
...@@ -90,7 +90,7 @@ protected: ...@@ -90,7 +90,7 @@ protected:
}; };
typedef boost::unordered_map<SCCOL, LastFormula> LastFormulaMapType; 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; RootData* pExcRoot;
...@@ -105,7 +105,7 @@ protected: ...@@ -105,7 +105,7 @@ protected:
XclImpOutlineBuffer* pColOutlineBuff; XclImpOutlineBuffer* pColOutlineBuff;
XclImpOutlineBuffer* pRowOutlineBuff; XclImpOutlineBuffer* pRowOutlineBuff;
XclImpColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle XclImpColRowSettings* pColRowBuff; // Col/Row settings 1 table
typedef boost::ptr_vector< XclImpOutlineDataBuffer > XclImpOutlineListBuffer; typedef boost::ptr_vector< XclImpOutlineDataBuffer > XclImpOutlineListBuffer;
XclImpOutlineListBuffer* pOutlineListBuffer; XclImpOutlineListBuffer* pOutlineListBuffer;
...@@ -117,17 +117,17 @@ protected: ...@@ -117,17 +117,17 @@ protected:
sal_uInt16 mnIxfeIndex; /// Current XF identifier from IXFE record. sal_uInt16 mnIxfeIndex; /// Current XF identifier from IXFE record.
sal_uInt16 mnLastRecId; sal_uInt16 mnLastRecId;
SCTAB nBdshtTab; // Counter fuer Boundsheet SCTAB nBdshtTab; // Counter for Boundsheet
bool bTabTruncated; // wenn Bereichsueberschreitung zum bool bTabTruncated; // if extended range leads to
// Abschneiden von Zellen fuehrt // truncation of cells
bool mbBiff2HasXfs:1; /// Select XF formatting or direct formatting in BIFF2. bool mbBiff2HasXfs:1; /// Select XF formatting or direct formatting in BIFF2.
bool mbBiff2HasXfsValid:1; /// False = mbBiff2HasXfs is undetermined yet. bool mbBiff2HasXfsValid:1; /// False = mbBiff2HasXfs is undetermined yet.
void SetLastFormula( SCCOL nCol, SCROW nRow, double fVal, sal_uInt16 nXF, ScFormulaCell* pCell ); void SetLastFormula( SCCOL nCol, SCROW nRow, double fVal, sal_uInt16 nXF, ScFormulaCell* pCell );
// Record-Funktionen // Record functions
void ReadFileSharing(); void ReadFileSharing();
sal_uInt16 ReadXFIndex( const ScAddress& rScPos, bool bBiff2 ); sal_uInt16 ReadXFIndex( const ScAddress& rScPos, bool bBiff2 );
......
...@@ -26,34 +26,34 @@ ...@@ -26,34 +26,34 @@
enum FUNC_TYPE enum FUNC_TYPE
{ {
FT_Return = 0, // End Formula FT_Return = 0, // End Formula
FT_FuncFix0, // Funktion, 0 Parameter FT_FuncFix0, // Function, 0 Parameter
FT_FuncFix1, // Funktion, 0 Parameter FT_FuncFix1, // Function, 0 Parameter
FT_FuncFix2, // Funktion, 0 Parameter FT_FuncFix2, // Function, 0 Parameter
FT_FuncFix3, // Funktion, 0 Parameter FT_FuncFix3, // Function, 0 Parameter
FT_FuncFix4, // Funktion, 0 Parameter FT_FuncFix4, // Function, 0 Parameter
FT_FuncVar, // ~, var. P. FT_FuncVar, // ~, var. P.
FT_Neg, // Negierung FT_Neg, // Negation
FT_Op, // Operator FT_Op, // Operator
FT_NotImpl, // nicht implementiert FT_NotImpl, // not implemented
FT_ConstFloat, // Double (8-Byte) FT_ConstFloat, // Double (8-Byte)
FT_Variable, // Single Ref FT_Variable, // Single Ref
FT_Range, // Double Ref FT_Range, // Double Ref
FT_Braces, // Klammmern FT_Braces, // Braces
FT_ConstInt, // Integer FT_ConstInt, // Integer
FT_ConstString, // String FT_ConstString, // String
FT_NOP, // nichts FT_NOP, // nothing
// zusaetzlich ab WK3 // additionally since WK3
FT_Cref, // Cell Reference FT_Cref, // Cell Reference
FT_Rref, // Range Reference FT_Rref, // Range Reference
FT_Nrref, // Named range reference FT_Nrref, // Named range reference
FT_Absnref, // Absolut named range FT_Absnref, // Absolute named range
FT_Erref, // Err range reference FT_Erref, // Err range reference
FT_Ecref, // Err cell reference FT_Ecref, // Err cell reference
FT_Econstant, // Err constant FT_Econstant, // Err constant
FT_Splfunc, // SPLfunction FT_Splfunc, // SPLfunction
FT_Const10Float,// Float (10-Byte) FT_Const10Float,// Float (10-Byte)
FT_Snum // Const Short Num FT_Snum // Const Short Num
// fuer 'Problemfaelle' beim Import // for 'Problem Cases' during Import
}; };
struct LotusContext; struct LotusContext;
...@@ -73,19 +73,19 @@ private: ...@@ -73,19 +73,19 @@ private:
static DefTokenId IndexToTokenWK123( sal_uInt8 ); static DefTokenId IndexToTokenWK123( sal_uInt8 );
void DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtName ); void DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtName );
void LotusRelToScRel(sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefData& rSRD); 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 bool bWK123; // alternative for 123
void ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nFlags ); void ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nFlags );
inline void ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nFlags ); inline void ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nFlags );
void IncToken( TokenId &rParam ); void IncToken( TokenId &rParam );
// ACHTUNG: hier wird die aktuelle Token-Kette im Pool // Attention: here the Token-chain is extended in Pool
// mit '(<rParam>)+1' fortgeschrieben und mit // with '(<rParam>)+1' and finished with Store() !
// Store() abgeschlossen!
void DecToken( TokenId& rParam ); void DecToken( TokenId& rParam );
// ACHTUNG: ~ // ACHTUNG: ~
void NegToken( TokenId& rParam ); void NegToken( TokenId& rParam );
// ACHTUNG: wie ~, nur wird '-(<rParam>)' gebildet // ACHTUNG: like ~, but with '-(<rParam>)'
public: public:
LotusToSc(LotusContext &rContext, SvStream& aStr, svl::SharedStringPool& rSPool, rtl_TextEncoding eSrc, bool b); LotusToSc(LotusContext &rContext, SvStream& aStr, svl::SharedStringPool& rSPool, rtl_TextEncoding eSrc, bool b);
...@@ -102,10 +102,10 @@ private: ...@@ -102,10 +102,10 @@ private:
inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit ) inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit )
{ {
// erster Teil // 1st part
ReadSRD( rCRD.Ref1, nRelBit ); ReadSRD( rCRD.Ref1, nRelBit );
// zweiter Teil // 2nd part
ReadSRD( rCRD.Ref2, nRelBit >> 3 ); ReadSRD( rCRD.Ref2, nRelBit >> 3 );
} }
......
...@@ -86,7 +86,7 @@ inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const ...@@ -86,7 +86,7 @@ inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const
class NameBuffer : public ExcRoot class NameBuffer : public ExcRoot
{ {
private: private:
sal_uInt16 nBase; // Index-Basis sal_uInt16 nBase; // Index-Base
std::vector<StringHashEntry*> maHashes; std::vector<StringHashEntry*> maHashes;
public: public:
...@@ -157,7 +157,7 @@ private: ...@@ -157,7 +157,7 @@ private:
StringHashEntry aStrHashEntry; StringHashEntry aStrHashEntry;
ScComplexRefData aScComplexRefDataRel; ScComplexRefData aScComplexRefDataRel;
OUString aScAbsName; OUString aScAbsName;
sal_uInt16 nAbsInd; // == 0 -> noch keine Abs-Name! sal_uInt16 nAbsInd; // == 0 -> no Abs-Name yet!
sal_uInt16 nRelInd; sal_uInt16 nRelInd;
bool bSingleRef; bool bSingleRef;
Entry( const OUString& rName, const OUString& rScName, const ScComplexRefData& rCRD ) Entry( const OUString& rName, const OUString& rScName, const ScComplexRefData& rCRD )
...@@ -209,16 +209,16 @@ private: ...@@ -209,16 +209,16 @@ private:
{ {
OUString aFile; OUString aFile;
OUString aTab; OUString aTab;
sal_uInt16 nTabNum; // 0xFFFF -> noch nicht angelegt sal_uInt16 nTabNum; // 0xFFFF -> not set yet
// 0xFFFE -> versucht anzulegen, ging aber schief // 0xFFFE -> tried to set, but failed
// 0xFFFD -> soll im selben Workbook sein, findet's aber nicht // 0xFFFD -> should be in the same workbook, but not found
bool bSWB; bool bSWB;
bool bLink; bool bLink;
Cont( const OUString& rFilePathAndName, const OUString& rTabName ) : Cont( const OUString& rFilePathAndName, const OUString& rTabName ) :
aFile( rFilePathAndName ), aFile( rFilePathAndName ),
aTab( rTabName ) aTab( rTabName )
{ {
nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt nTabNum = 0xFFFF; // -> table not created yet
bSWB = bLink = false; bSWB = bLink = false;
} }
Cont( const OUString& rFilePathAndName, const OUString& rTabName, Cont( const OUString& rFilePathAndName, const OUString& rTabName,
...@@ -226,7 +226,7 @@ private: ...@@ -226,7 +226,7 @@ private:
aFile( rFilePathAndName ), aFile( rFilePathAndName ),
aTab( rTabName ) aTab( rTabName )
{ {
nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt nTabNum = 0xFFFF; // -> table not created yet
bSWB = bSameWB; bSWB = bSameWB;
bLink = false; bLink = false;
} }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
class ScRTFExport : public ScExportBase class ScRTFExport : public ScExportBase
{ {
sal_uLong* pCellX; // kumulierte Zellbreiten einer Tabelle sal_uLong* pCellX; // cumulative range in a table
void WriteTab( SCTAB nTab ); void WriteTab( SCTAB nTab );
void WriteRow( SCTAB nTab, SCROW nRow ); void WriteRow( SCTAB nTab, SCROW nRow );
......
This diff is collapsed.
...@@ -67,27 +67,27 @@ enum E_TYPE ...@@ -67,27 +67,27 @@ enum E_TYPE
T_RefC, // Cell Reference T_RefC, // Cell Reference
T_RefA, // Area Reference T_RefA, // Area Reference
T_RN, // Range Name 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_Nlf, // token for natural language formula
T_Matrix, // token for inline arrays T_Matrix, // token for inline arrays
T_ExtName, // token for external names T_ExtName, // token for external names
T_ExtRefC, T_ExtRefC,
T_ExtRefA, T_ExtRefA,
T_Error // fuer Abfrage im Fehlerfall T_Error // for check in case of error
}; };
class TokenPool class TokenPool
{ {
// !ACHTUNG!: externe Id-Basis ist 1, interne 0! // !ATTENTION!: external Id-Basis is 1, internal 0!
// Ausgabe Id = 0 -> Fehlerfall // return Id = 0 -> Error
private: private:
svl::SharedStringPool& mrStringPool; svl::SharedStringPool& mrStringPool;
OUString** ppP_Str; // Pool fuer Strings OUString** ppP_Str; // Pool for Strings
sal_uInt16 nP_Str; // ...mit Groesse sal_uInt16 nP_Str; // ...with size
sal_uInt16 nP_StrAkt; // ...und Schreibmarke 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_Dbl;
sal_uInt16 nP_DblAkt; sal_uInt16 nP_DblAkt;
...@@ -95,14 +95,14 @@ private: ...@@ -95,14 +95,14 @@ private:
sal_uInt16 nP_Err; sal_uInt16 nP_Err;
sal_uInt16 nP_ErrAkt; sal_uInt16 nP_ErrAkt;
ScSingleRefData** ppP_RefTr; // Pool fuer Referenzen ScSingleRefData** ppP_RefTr; // Pool for References
sal_uInt16 nP_RefTr; sal_uInt16 nP_RefTr;
sal_uInt16 nP_RefTrAkt; 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_Id;
sal_uInt16 nP_IdAkt; sal_uInt16 nP_IdAkt;
sal_uInt16 nP_IdLast; // letzter Folgen-Beginn sal_uInt16 nP_IdLast; // last set-start
struct EXTCONT struct EXTCONT
{ {
...@@ -124,7 +124,7 @@ private: ...@@ -124,7 +124,7 @@ private:
sal_uInt16 nP_Nlf; sal_uInt16 nP_Nlf;
sal_uInt16 nP_NlfAkt; sal_uInt16 nP_NlfAkt;
ScMatrix** ppP_Matrix; // Pool fuer Matricies ScMatrix** ppP_Matrix; // Pool for Matrices
sal_uInt16 nP_Matrix; sal_uInt16 nP_Matrix;
sal_uInt16 nP_MatrixAkt; sal_uInt16 nP_MatrixAkt;
...@@ -162,13 +162,13 @@ private: ...@@ -162,13 +162,13 @@ private:
}; };
::std::vector<ExtAreaRef> maExtAreaRefs; ::std::vector<ExtAreaRef> maExtAreaRefs;
sal_uInt16* pElement; // Array mit Indizes fuer Elemente sal_uInt16* pElement; // Array with Indices for elements
E_TYPE* pType; // ...mit Typ-Info E_TYPE* pType; // ...with Typ-Info
sal_uInt16* pSize; // ...mit Laengenangabe (Anz. sal_uInt16) sal_uInt16* pSize; // ...with size (Anz. sal_uInt16)
sal_uInt16 nElement; sal_uInt16 nElement;
sal_uInt16 nElementAkt; sal_uInt16 nElementAkt;
static const sal_uInt16 nScTokenOff;// Offset fuer SC-Token static const sal_uInt16 nScTokenOff;// Offset for SC-Token
#ifdef DBG_UTIL #ifdef DBG_UTIL
sal_uInt16 m_nRek; // recursion counter sal_uInt16 m_nRek; // recursion counter
#endif #endif
...@@ -199,7 +199,7 @@ public: ...@@ -199,7 +199,7 @@ public:
inline const TokenId Store( void ); inline const TokenId Store( void );
const TokenId Store( const double& rDouble ); const TokenId Store( const double& rDouble );
// nur fuer Range-Names // only for Range-Names
const TokenId Store( const sal_uInt16 nIndex ); const TokenId Store( const sal_uInt16 nIndex );
inline const TokenId Store( const sal_Int16 nWert ); inline const TokenId Store( const sal_Int16 nWert );
const TokenId Store( const OUString& rString ); const TokenId Store( const OUString& rString );
...@@ -207,7 +207,7 @@ public: ...@@ -207,7 +207,7 @@ public:
const TokenId Store( const ScComplexRefData& rTr ); const TokenId Store( const ScComplexRefData& rTr );
const TokenId Store( const DefTokenId eId, const OUString& rName ); 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 StoreNlf( const ScSingleRefData& rTr );
const TokenId StoreMatrix(); const TokenId StoreMatrix();
const TokenId StoreName( sal_uInt16 nIndex, bool bGlobal ); const TokenId StoreName( sal_uInt16 nIndex, bool bGlobal );
...@@ -225,13 +225,13 @@ public: ...@@ -225,13 +225,13 @@ public:
}; };
class TokenStack class TokenStack
// Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als // Stack for Token-Ids: reserve Id=0 for error; e.g. Get() returns 0 on error
// fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert
{ {
private: private:
TokenId* pStack; // Stack als Array TokenId* pStack; // Stack as Array
sal_uInt16 nPos; // Schreibmarke sal_uInt16 nPos; // Write-mark
sal_uInt16 nSize; // Erster Index ausserhalb des Stacks sal_uInt16 nSize; // first Index outside of stack
public: public:
TokenStack( sal_uInt16 nNewSize = 1024 ); TokenStack( sal_uInt16 nNewSize = 1024 );
~TokenStack(); ~TokenStack();
...@@ -247,7 +247,7 @@ class TokenStack ...@@ -247,7 +247,7 @@ class TokenStack
inline const TokenId TokenStack::Get( void ) inline const TokenId TokenStack::Get( void )
{ {
OSL_ENSURE( nPos > 0, OSL_ENSURE( nPos > 0,
"*TokenStack::Get(): Leer ist leer, ist leer, ist leer, ist..." ); "*TokenStack::Get(): is empty, is empty, ..." );
TokenId nRet; TokenId nRet;
...@@ -263,7 +263,7 @@ inline const TokenId TokenStack::Get( void ) ...@@ -263,7 +263,7 @@ inline const TokenId TokenStack::Get( void )
} }
inline TokenStack &TokenStack::operator <<( const TokenId nNewId ) inline TokenStack &TokenStack::operator <<( const TokenId nNewId )
{// Element auf Stack {// Element on Stack
OSL_ENSURE( nPos < nSize, "*TokenStack::<<(): Stack overflow" ); OSL_ENSURE( nPos < nSize, "*TokenStack::<<(): Stack overflow" );
if( nPos < nSize ) if( nPos < nSize )
{ {
...@@ -275,9 +275,9 @@ inline TokenStack &TokenStack::operator <<( const TokenId nNewId ) ...@@ -275,9 +275,9 @@ inline TokenStack &TokenStack::operator <<( const TokenId nNewId )
} }
inline void TokenStack::operator >>( TokenId& rId ) inline void TokenStack::operator >>( TokenId& rId )
{// Element von Stack {// Element of Stack
OSL_ENSURE( nPos > 0, OSL_ENSURE( nPos > 0,
"*TokenStack::>>(): Leer ist leer, ist leer, ist leer, ..." ); "*TokenStack::>>(): is empty, is empty, ..." );
if( nPos > 0 ) if( nPos > 0 )
{ {
nPos--; nPos--;
...@@ -292,11 +292,11 @@ inline void TokenStack::Reset( void ) ...@@ -292,11 +292,11 @@ inline void TokenStack::Reset( void )
inline TokenPool& TokenPool::operator <<( const TokenId nId ) inline TokenPool& TokenPool::operator <<( const TokenId nId )
{ {
// POST: nId's werden hintereinander im Pool unter einer neuen Id // POST: nId's are stored consecutively in Pool under a new Id;
// abgelegt. Vorgang wird mit >> oder Store() abgeschlossen // finalize with >> or Store()
// nId -> ( sal_uInt16 ) nId - 1; // nId -> ( sal_uInt16 ) nId - 1;
OSL_ENSURE( ( sal_uInt16 ) nId < nScTokenOff, OSL_ENSURE( ( sal_uInt16 ) nId < nScTokenOff,
"-TokenPool::operator <<: TokenId im DefToken-Bereich!" ); "-TokenPool::operator <<: TokenId in DefToken-Range!" );
if( nP_IdAkt >= nP_Id ) if( nP_IdAkt >= nP_Id )
if (!GrowId()) if (!GrowId())
...@@ -311,7 +311,7 @@ inline TokenPool& TokenPool::operator <<( const TokenId nId ) ...@@ -311,7 +311,7 @@ inline TokenPool& TokenPool::operator <<( const TokenId nId )
inline TokenPool& TokenPool::operator <<( const DefTokenId eId ) inline TokenPool& TokenPool::operator <<( const DefTokenId eId )
{ {
OSL_ENSURE( ( sal_uInt32 ) eId + nScTokenOff < 0xFFFF, OSL_ENSURE( ( sal_uInt32 ) eId + nScTokenOff < 0xFFFF,
"-TokenPool::operator<<: enmum zu gross!" ); "-TokenPool::operator<<: enmum too large!" );
if( nP_IdAkt >= nP_Id ) if( nP_IdAkt >= nP_Id )
if (!GrowId()) if (!GrowId())
...@@ -356,7 +356,7 @@ inline const TokenId TokenPool::Store( const sal_Int16 nWert ) ...@@ -356,7 +356,7 @@ inline const TokenId TokenPool::Store( const sal_Int16 nWert )
inline const TokenId TokenPool::LastId( void ) const 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 ) const inline ScTokenArray* TokenPool::operator []( const TokenId nId )
...@@ -364,7 +364,7 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId ) ...@@ -364,7 +364,7 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId )
pScToken->Clear(); pScToken->Clear();
if( nId ) if( nId )
{//...nur wenn nId > 0! {//...only if nId > 0!
#ifdef DBG_UTIL #ifdef DBG_UTIL
m_nRek = 0; m_nRek = 0;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment