[Libreoffice-commits] .: sc/inc

Caolán McNamara caolan at kemper.freedesktop.org
Sun Jan 9 07:17:41 PST 2011


 sc/inc/dbcolect.hxx |   18 +++----
 sc/inc/dociter.hxx  |   39 ++++++++--------
 sc/inc/docoptio.hxx |   24 +++++-----
 sc/inc/docpool.hxx  |    2 
 sc/inc/document.hxx |  120 ++++++++++++++++++++++++++--------------------------
 5 files changed, 103 insertions(+), 100 deletions(-)

New commits:
commit 320e2cb97395eafbcc0021e128246fe8793a2157
Author: Christina Roßmanith <ChrRossmanith at web.de>
Date:   Sun Jan 9 15:17:31 2011 +0000

    translate some comments

diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx
index 95d2649..378c29b 100644
--- a/sc/inc/dbcolect.hxx
+++ b/sc/inc/dbcolect.hxx
@@ -108,18 +108,18 @@ private:
     SCCOL			nSubTotals[MAXSUBTOTAL];
     SCCOL*			pSubTotals[MAXSUBTOTAL];
     ScSubTotalFunc*	pFunctions[MAXSUBTOTAL];
-    // Datenbank-Import
+    // data base import
     BOOL			bDBImport;
     String			aDBName;
     String			aDBStatement;
     BOOL			bDBNative;
-    BOOL			bDBSelection;		// nicht im Param: Wenn Selektion, Update sperren
-    BOOL			bDBSql;				// aDBStatement ist SQL und kein Name
-    BYTE			nDBType;			// enum DBObject (bisher nur dbTable, dbQuery)
+    BOOL			bDBSelection;		// not in Param: if selection, block update
+    BOOL			bDBSql;				// aDBStatement is SQL not a name
+    BYTE			nDBType;			// enum DBObject (up to now only dbTable, dbQuery)
 
-    USHORT			nIndex; 			// eindeutiger Index fuer Formeln
-    BOOL			bAutoFilter;		// AutoFilter? (nicht gespeichert)
-    BOOL			bModified;			// wird bei UpdateReference gesetzt/geloescht
+    USHORT			nIndex; 			// unique index formulas
+    BOOL			bAutoFilter;		// AutoFilter? (not saved)
+    BOOL			bModified;			// is set/cleared for/by(?) UpdateReference
 
     using ScRefreshTimer::operator==;
 
@@ -201,13 +201,13 @@ class SC_DLLPUBLIC ScDBCollection : public ScSortedCollection
 private:
     Link		aRefreshHandler;
     ScDocument* pDoc;
-    USHORT nEntryIndex;			// Zaehler fuer die eindeutigen Indizes
+    USHORT nEntryIndex;			// counter for unique indices
 
 public:
     ScDBCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, ScDocument* pDocument = NULL) :
                     ScSortedCollection	( nLim, nDel, bDup ),
                     pDoc				( pDocument ),
-                    nEntryIndex			( SC_START_INDEX_DB_COLL )	// oberhalb der Namen
+                    nEntryIndex			( SC_START_INDEX_DB_COLL )	// see above for the names
                     {}
     ScDBCollection(const ScDBCollection& rScDBCollection) :
                     ScSortedCollection	( rScDBCollection ),
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 0c1b06a..0159357 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -49,7 +49,7 @@ class ScAttrIterator;
 class ScRange;
 class ScFlatBoolRowSegments;
 
-class ScDocumentIterator				// alle nichtleeren Zellen durchgehen
+class ScDocumentIterator				// walk through all non-empty cells
 {
 private:
     ScDocument*				pDoc;
@@ -83,13 +83,13 @@ public:
     void					GetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab );
 };
 
-class ScValueIterator            // alle Zahlenwerte in einem Bereich durchgehen
+class ScValueIterator            // walk through all values in an area
 {
 private:
     double			fNextValue;
     ScDocument*		pDoc;
     const ScAttrArray*	pAttrArray;
-    ULONG			nNumFormat;		// fuer CalcAsShown
+    ULONG			nNumFormat;		// for CalcAsShown
     ULONG			nNumFmtIndex;
     SCCOL			nStartCol;
     SCROW			nStartRow;
@@ -218,9 +218,9 @@ public:
 
 // ============================================================================
 
-class ScCellIterator            // alle Zellen in einem Bereich durchgehen
-{								// bei SubTotal aber keine ausgeblendeten und
-private:						// SubTotalZeilen
+class ScCellIterator            // walk through all cells in an area
+{								// for SubTotal no hidden and no sub-total lines
+private:
     ScDocument*		pDoc;
     SCCOL			nStartCol;
     SCROW			nStartRow;
@@ -250,8 +250,8 @@ public:
     ScAddress       GetPos() const { return ScAddress( nCol, nRow, nTab ); }
 };
 
-class ScQueryCellIterator           // alle nichtleeren Zellen in einem Bereich
-{									// durchgehen
+class ScQueryCellIterator           // walk through all non-empty cells in an area
+{
     enum StopOnMismatchBits
     {
         nStopOnMismatchDisabled = 0x00,
@@ -299,15 +299,15 @@ private:
 public:
                     ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable,
                                         const ScQueryParam& aParam, BOOL bMod = TRUE);
-                                        // fuer bMod = FALSE muss der QueryParam
-                                        // weiter aufgefuellt sein (bIsString)
+                                        // for bMod = FALSE the QueryParam has to be filled
+                                        // (bIsString)
     ScBaseCell*		GetFirst();
     ScBaseCell*		GetNext();
     SCCOL           GetCol() { return nCol; }
     SCROW           GetRow() { return nRow; }
 
-                    // setzt alle Entry.nField einen weiter, wenn Spalte
-                    // wechselt, fuer ScInterpreter ScHLookup()
+                    // increments all Entry.nField, if column
+                    // changes, for ScInterpreter ScHLookup()
     void			SetAdvanceQueryParamEntryField( BOOL bVal )
                         { bAdvanceQuery = bVal; }
     void			AdvanceQueryParamEntryField();
@@ -376,7 +376,7 @@ public:
                         BOOL bIgnoreMismatchOnLeadingStrings = TRUE );
 };
 
-class ScDocAttrIterator				// alle Attribut-Bereiche
+class ScDocAttrIterator				// all attribute areas
 {
 private:
     ScDocument*		pDoc;
@@ -395,7 +395,8 @@ public:
     const ScPatternAttr*	GetNext( SCCOL& rCol, SCROW& rRow1, SCROW& rRow2 );
 };
 
-class ScAttrRectIterator			// alle Attribut-Bereiche, auch Bereiche ueber mehrere Spalten
+class ScAttrRectIterator			// all attribute areas, including areas stretching
+                                    // across more then one column
 {
 private:
     ScDocument*		pDoc;
@@ -416,8 +417,8 @@ public:
     const ScPatternAttr*	GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow1, SCROW& rRow2 );
 };
 
-class ScHorizontalCellIterator		// alle nichtleeren Zellen in einem Bereich
-{									// zeilenweise durchgehen
+class ScHorizontalCellIterator		// walk through all non empty cells in an area
+{									// row by row
 private:
     ScDocument*		pDoc;
     SCTAB			nTab;
@@ -444,7 +445,7 @@ private:
 
 
 //
-//	gibt alle Bereiche mit nicht-Default-Formatierung zurueck (horizontal)
+//	returns all areas with non-default formatting (horizontal)
 //
 
 class ScHorizontalAttrIterator
@@ -473,7 +474,7 @@ public:
 };
 
 //
-//	gibt nichtleere Zellen und Bereiche mit Formatierung zurueck (horizontal)
+//	returns non-empty cells and areas with formatting (horizontal)
 //
 
 class SC_DLLPUBLIC ScUsedAreaIterator
@@ -493,7 +494,7 @@ private:
     SCROW					nAttrRow;
     const ScPatternAttr*	pPattern;
 
-    SCCOL					nFoundStartCol;			// Ergebnisse nach GetNext
+    SCCOL					nFoundStartCol;			// results after GetNext
     SCCOL					nFoundEndCol;
     SCROW					nFoundRow;
     const ScPatternAttr*	pFoundPattern;
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 5458b8f..4cccec8 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -39,21 +39,21 @@
 
 class SC_DLLPUBLIC ScDocOptions
 {
-    double fIterEps;				// Epsilon-Wert dazu
-    USHORT nIterCount;				// Anzahl
+    double fIterEps;				// epsilon value dazu
+    USHORT nIterCount;				// number
     sal_uInt16 nPrecStandardFormat; // precision for standard format
     ScOptionsUtil::KeyBindingType eKeyBindingType;
-    USHORT nDay;					// Nulldatum:
+    USHORT nDay;					// Null date:
     USHORT nMonth;
     USHORT nYear;
-    USHORT nYear2000;				// bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird
-    USHORT nTabDistance;			// Abstand Standardtabulatoren
-    BOOL   bIsIgnoreCase;			// Gross-/Kleinschr. bei Vergleichen
-    BOOL   bIsIter;					// Iteration bei cirk. Ref
-    BOOL   bCalcAsShown;			// berechnen wie angezeigt (Precision)
-    BOOL   bMatchWholeCell;			// Suchkriterien muessen ganze Zelle matchen
-    BOOL   bDoAutoSpell;			// Auto-Spelling
-    BOOL   bLookUpColRowNames;		// Spalten-/Zeilenbeschriftungen automagisch suchen
+    USHORT nYear2000;				// earlier 19YY is assumed, 20YY otherwise (if only YY of year is given)
+    USHORT nTabDistance;			// distance of standard tabs
+    BOOL   bIsIgnoreCase;			// ignore case for comparisons?
+    BOOL   bIsIter;					// iterations for circular refs
+    BOOL   bCalcAsShown;			// calculate as shown (wrt precision)
+    BOOL   bMatchWholeCell;			// search criteria must match the whole cell
+    BOOL   bDoAutoSpell;			// auto-spelling
+    BOOL   bLookUpColRowNames;		// determine column-/row titles automagically
     BOOL   bFormulaRegexEnabled;    // regular expressions in formulas enabled
     bool   bUseEnglishFuncName;     // use English function name even if the locale is not English.
     ::formula::FormulaGrammar::Grammar eFormulaGrammar;  // formula grammar used to switch different formula syntax
@@ -189,7 +189,7 @@ inline int ScDocOptions::operator!=( const ScDocOptions& rOpt ) const
 }
 
 //==================================================================
-// Item fuer Einstellungsdialog - Berechnen
+// Item for preferences dialog - calculation
 //==================================================================
 
 class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index 934702d..809ebe4 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -65,7 +65,7 @@ public:
     virtual void				Remove( const SfxPoolItem& );
     static void					CheckRef( const SfxPoolItem& );
 
-    void StyleDeleted( ScStyleSheet* pStyle );		// Loeschen von Vorlagen im Organizer
+    void StyleDeleted( ScStyleSheet* pStyle );		// delete templates(?) in organizer
     void CellStyleCreated( const String& rName );
     virtual SfxItemPresentation		GetPresentation(
                                         const SfxPoolItem&	rItem,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a3b1fd9..c7f4fea 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -239,9 +239,9 @@ private:
     VirtualDevice*		pVirtualDevice_100th_mm;
     ScDrawLayer*		pDrawLayer;						// SdrModel
     XColorTable*		pColorTable;
-    ScConditionalFormatList* pCondFormList;				// bedingte Formate
-    ScValidationDataList* pValidationList;				// Gueltigkeit
-    SvNumberFormatterIndexTable*	pFormatExchangeList;			// zum Umsetzen von Zahlenformaten
+    ScConditionalFormatList* pCondFormList;				// conditional formats
+    ScValidationDataList* pValidationList;				// validity
+    SvNumberFormatterIndexTable*	pFormatExchangeList;	// for application of number formats
     ScTable*			pTab[MAXTABCOUNT];
     ScRangeName*		pRangeName;
     ScDBCollection*		pDBCollection;
@@ -252,12 +252,12 @@ private:
     // End Comments
     ScChartCollection*	pChartCollection;
     std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock;
-    ScPatternAttr*		pSelectionAttr;					// Attribute eines Blocks
+    ScPatternAttr*		pSelectionAttr;					// Attributes of a block
     mutable sfx2::LinkManager*		pLinkManager;
-    ScFormulaCell*		pFormulaTree;					// Berechnungsbaum Start
-    ScFormulaCell*		pEOFormulaTree;					// Berechnungsbaum Ende, letzte Zelle
-    ScFormulaCell*		pFormulaTrack;					// BroadcastTrack Start
-    ScFormulaCell*		pEOFormulaTrack;				// BrodcastTrack Ende, letzte Zelle
+    ScFormulaCell*		pFormulaTree;					// formula tree (start)
+    ScFormulaCell*		pEOFormulaTree;					// formula tree (end), last cell
+    ScFormulaCell*		pFormulaTrack;					// BroadcastTrack (start)
+    ScFormulaCell*		pEOFormulaTrack;				// BrodcastTrack (end), last cell
     ScBroadcastAreaSlotMachine*	pBASM;					// BroadcastAreas
     ScChartListenerCollection* pChartListenerCollection;
     ScStrCollection*		pOtherObjects;					// non-chart OLE objects
@@ -285,14 +285,14 @@ private:
     mutable ::std::auto_ptr< ScFormulaParserPool >
                         mxFormulaParserPool;            /// Pool for all external formula parsers used by this document.
 
-    String              aDocName;                       // opt: Dokumentname
-    String              aDocCodeName;                       // opt: Dokumentname
+    String              aDocName;                       // optional: name of document
+    String              aDocCodeName;                       // optional: name of document (twice?)
     ScRangePairListRef	xColNameRanges;
     ScRangePairListRef	xRowNameRanges;
 
-    ScViewOptions*		pViewOptions;					// View-Optionen
-    ScDocOptions*		pDocOptions;					// Dokument-Optionen
-    ScExtDocOptions*	pExtDocOptions;					// fuer Import etc.
+    ScViewOptions*		pViewOptions;					// view options
+    ScDocOptions*		pDocOptions;					// document options
+    ScExtDocOptions*	pExtDocOptions;					// for import etc.
     ScConsolidateParam*	pConsolidateDlgData;
 
     ScRecursionHelper*  pRecursionHelper;               // information for recursive and iterative cell formulas
@@ -324,7 +324,7 @@ private:
     LanguageType		eLanguage;						// default language
     LanguageType		eCjkLanguage;					// default language for asian text
     LanguageType		eCtlLanguage;					// default language for complex text
-    CharSet				eSrcSet; 						// Einlesen: Quell-Zeichensatz
+    CharSet				eSrcSet; 						// during reading: source character set
 
     /** The compiler grammar used in document storage. GRAM_PODF for ODF 1.1
         documents, GRAM_ODFF for ODF 1.2 documents. */
@@ -337,58 +337,59 @@ private:
 
     ULONG				nFormulaCodeInTree;				// FormelRPN im Formelbaum
     ULONG               nXMLImportedFormulaCount;        // progress count during XML import
-    USHORT				nInterpretLevel;				// >0 wenn im Interpreter
-    USHORT				nMacroInterpretLevel; 			// >0 wenn Macro im Interpreter
-    USHORT				nInterpreterTableOpLevel;		// >0 if in Interpreter TableOp
+    USHORT				nInterpretLevel;				// >0 if in interpreter
+    USHORT				nMacroInterpretLevel; 			// >0 if macro in interpreter
+    USHORT				nInterpreterTableOpLevel;		// >0 if in interpreter TableOp
     SCTAB				nMaxTableNumber;
-    USHORT				nSrcVer;						// Dateiversion (Laden/Speichern)
-    SCROW				nSrcMaxRow;						// Zeilenzahl zum Laden/Speichern
+    USHORT				nSrcVer;						// file version (load/save)
+    SCROW				nSrcMaxRow;						// number of lines to load/save
     USHORT				nFormulaTrackCount;
     USHORT				nHardRecalcState;				// 0: soft, 1: hard-warn, 2: hard
-    SCTAB				nVisibleTab;					// fuer OLE etc.
+    SCTAB				nVisibleTab;					// for OLE etc.
 
     ScLkUpdMode			eLinkMode;
 
-    BOOL				bAutoCalc;						// Automatisch Berechnen
-    BOOL				bAutoCalcShellDisabled;			// in/von/fuer ScDocShell disabled
-    // ob noch ForcedFormulas berechnet werden muessen,
-    // im Zusammenspiel mit ScDocShell SetDocumentModified,
-    // AutoCalcShellDisabled und TrackFormulas
+    BOOL				bAutoCalc;						// calculate automatically
+    BOOL				bAutoCalcShellDisabled;			// in/from/for ScDocShell disabled
+    // are there ForcedFormulas which have to be calculated
+    // in interaction with ScDocShell SetDocumentModified,
+    // AutoCalcShellDisabled and TrackFormulas
     BOOL				bForcedFormulaPending;
     BOOL				bCalculatingFormulaTree;
     BOOL				bIsClip;
     BOOL				bIsUndo;
     BOOL				bIsVisible;						// set from view ctor
 
-    BOOL				bIsEmbedded;					// Embedded-Bereich anzeigen/anpassen ?
+    BOOL				bIsEmbedded;					// display/adjust Embedded area?
 
-    // kein SetDirty bei ScFormulaCell::CompileTokenArray sondern am Ende
-    // von ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip
+    // no SetDirty for ScFormulaCell::CompileTokenArray but at the end of
+    // ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip
     BOOL				bNoSetDirty;
-    // kein Broadcast, keine Listener aufbauen waehrend aus einem anderen
-    // Doc (per Filter o.ae.) inserted wird, erst bei CompileAll / CalcAfterLoad
+    // no broadcast, construct no listener during insert from a different 
+    // Doc (per filter or the like ), not until CompileAll / CalcAfterLoad
     BOOL				bInsertingFromOtherDoc;
     bool                bLoadingMedium;
     bool                bImportingXML;      // special handling of formula text
     BOOL                bXMLFromWrapper;    // distinguish ScXMLImportWrapper from external component
     BOOL				bCalcingAfterLoad;				// in CalcAfterLoad TRUE
-    // wenn temporaer keine Listener auf/abgebaut werden sollen
+    // don't construct/destruct listeners temporarily
     BOOL				bNoListening;
     BOOL				bIdleDisabled;
     BOOL				bInLinkUpdate;					// TableLink or AreaLink
     BOOL				bChartListenerCollectionNeedsUpdate;
-    // ob RC_FORCED Formelzellen im Dokument sind/waren (einmal an immer an)
+    // are/were there RC_FORCED formula cells in the document (if set once to TRUE then set forever)
     BOOL				bHasForcedFormulas;
-    // ob das Doc gerade zerstoert wird (kein Notify-Tracking etc. mehr)
+    // is the Doc being destroyed? (no Notify-Tracking etc. needed anymore)
     BOOL				bInDtorClear;
-    // ob bei Spalte/Zeile einfuegen am Rand einer Referenz die Referenz
-    // erweitert wird, wird in jedem UpdateReference aus InputOptions geholt,
-    // gesetzt und am Ende von UpdateReference zurueckgesetzt
+    // expand reference if insert column/row takes place at the border 
+    // of a reference
+    // is fetched in each UpdateReference from InputOptions,
+    // assigned, and restored at the end of UpdateReference
     BOOL				bExpandRefs;
-    // fuer Detektiv-Update, wird bei jeder Aenderung an Formeln gesetzt
+    // for detective update, is set for each change of a formula
     BOOL				bDetectiveDirty;
 
-    BYTE				nMacroCallMode;		// Makros per Warnung-Dialog disabled?
+    BYTE				nMacroCallMode;		// Macros per warning dialog disabled?
     BOOL				bHasMacroFunc;		// valid only after loading
 
     BYTE				nVisSpellState;
@@ -418,9 +419,9 @@ private:
     ::std::set<ScFormulaCell*> maSubTotalCells;
 
 public:
-    SC_DLLPUBLIC ULONG			GetCellCount() const;		// alle Zellen
+    SC_DLLPUBLIC ULONG			GetCellCount() const;		// all cells
     SCSIZE          GetCellCount(SCTAB nTab, SCCOL nCol) const;
-    ULONG			GetCodeCount() const;		// RPN-Code in Formeln
+    ULONG			GetCodeCount() const;		// RPN-Code in formulas
     DECL_LINK( GetUserDefinedColor, USHORT * );
                                                                 // Numberformatter
 
@@ -566,7 +567,7 @@ public:
     void			SetEmbedded( const ScRange& rRange );
     void			ResetEmbedded();
     Rectangle		GetEmbeddedRect() const;						// 1/100 mm
-    void			SetEmbedded( const Rectangle& rRect );			// aus VisArea (1/100 mm)
+    void			SetEmbedded( const Rectangle& rRect );			// from VisArea (1/100 mm)
     void			SnapVisArea( Rectangle& rRect ) const;			// 1/100 mm
 
     static SC_DLLPUBLIC bool ValidTabName( const String& rName );
@@ -608,7 +609,7 @@ public:
     SC_DLLPUBLIC bool IsDefaultTabBgColor( SCTAB nTab ) const;
     void			GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const;
     SC_DLLPUBLIC BOOL			IsActiveScenario( SCTAB nTab ) const;
-    SC_DLLPUBLIC void			SetActiveScenario( SCTAB nTab, BOOL bActive );		// nur fuer Undo etc.
+    SC_DLLPUBLIC void			SetActiveScenario( SCTAB nTab, BOOL bActive );		// only for Undo etc.
     SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const;
     SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const;
     void            SetGrammar( formula::FormulaGrammar::Grammar eGram );
@@ -652,7 +653,7 @@ public:
     SC_DLLPUBLIC void			CopyDdeLinks( ScDocument* pDestDoc ) const;
     void			DisconnectDdeLinks();
 
-                    // Fuer StarOne Api:
+                    // for StarOne Api:
     USHORT			GetDdeLinkCount() const;
     BOOL			UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem );
 
@@ -692,7 +693,7 @@ public:
     SfxBindings*	GetViewBindings();
     SfxObjectShell* GetDocumentShell() const	{ return pShell; }
     ScDrawLayer*	GetDrawLayer()				{ return pDrawLayer; }
-    SfxBroadcaster*	GetDrawBroadcaster();		// zwecks Header-Vermeidung
+    SfxBroadcaster*	GetDrawBroadcaster();		// to avoid header
     void			BeginDrawUndo();
 
     void            BeginUnoRefUndo();
@@ -709,7 +710,7 @@ public:
                                     SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
-                    //! setzt nur die neue RangeList, keine ChartListener o.ae.
+                    //! only assigns the new RangeList, no ChartListener or the like
     void			SetChartRangeList( const String& rChartName,
                         const ScRangeListRef& rNewRangeListRef );
 
@@ -746,7 +747,7 @@ public:
                             BOOL bForceTab = FALSE );
     SC_DLLPUBLIC void			PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
                             ULONG nFormatIndex, BOOL bForceTab = FALSE);
-                    //	return TRUE = Zahlformat gesetzt
+                    //	return TRUE = number format is set
     SC_DLLPUBLIC BOOL           SetString(
         SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
         ScSetStringParam* pParam = NULL );
@@ -759,7 +760,7 @@ public:
                                         const String& rFormula,
                                         const ScTokenArray* p = NULL,
                                         const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT );
-    SC_DLLPUBLIC void 			InsertTableOp(const ScTabOpParam& rParam,	// Mehrfachoperation
+    SC_DLLPUBLIC void 			InsertTableOp(const ScTabOpParam& rParam,	// multi-operation
                                   SCCOL nCol1, SCROW nRow1,
                                   SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark);
 
@@ -828,7 +829,7 @@ public:
 
     SC_DLLPUBLIC void			DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
                                     SCCOL nEndCol, SCROW nEndRow );
-                    //	ohne Ueberpruefung:
+                    //	without checking:
     SC_DLLPUBLIC void			DoMerge( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
                                     SCCOL nEndCol, SCROW nEndRow, bool bDeleteCaptions = true );
     void			RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab );
@@ -880,13 +881,13 @@ public:
                     /** Zap all caches. */
     void            ClearLookupCaches();
 
-                    // Automatisch Berechnen
+                    // calculate automatically
     void			SetAutoCalc( BOOL bNewAutoCalc );
     BOOL			GetAutoCalc() const { return bAutoCalc; }
-                    // Automatisch Berechnen in/von/fuer ScDocShell disabled
+                    // calculate automatically in/from/for ScDocShell disabled
     void			SetAutoCalcShellDisabled( BOOL bNew ) { bAutoCalcShellDisabled = bNew; }
     BOOL			IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; }
-                    // ForcedFormulas zu berechnen
+                    // ForcedFormulas are to be calculated 
     void			SetForcedFormulaPending( BOOL bNew ) { bForcedFormulaPending = bNew; }
     BOOL			IsForcedFormulaPending() const { return bForcedFormulaPending; }
                     // if CalcFormulaTree() is currently running
@@ -1078,7 +1079,7 @@ public:
     SC_DLLPUBLIC void			InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection,
                                 BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE );
 
-                    //	nicht mehr benutzen:
+                    //	don't use anymore:
     void			CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                 SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
                                 USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc,
@@ -1243,8 +1244,9 @@ public:
                                         ScMarkData& rMark,
                                         String& rUndoStr, ScDocument* pUndoDoc = NULL );
 
-                    // Col/Row von Folgeaufrufen bestimmen
-                    // (z.B. nicht gefunden von Anfang, oder folgende Tabellen)
+                    // determine Col/Row of subsequent calls
+                    // (e.g. not found from the beginning, or subsequent tables)
+                    // meaning of explanation in "()" was already unclear in German
     static void		GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
                         SCCOL& rCol, SCROW& rRow );
 
@@ -1407,7 +1409,7 @@ public:
 
     SC_DLLPUBLIC BOOL			NeedPageResetAfterTab( SCTAB nTab ) const;
 
-    // war vorher im PageStyle untergracht. Jetzt an jeder Tabelle:
+    // Was stored in PageStyle previously. Now it exists for every table:
     SC_DLLPUBLIC BOOL			HasPrintRange();
     SC_DLLPUBLIC USHORT			GetPrintRangeCount( SCTAB nTab );
     SC_DLLPUBLIC const ScRange*	GetPrintRange( SCTAB nTab, USHORT nPos );
@@ -1497,7 +1499,7 @@ public:
     BOOL			IdleCalcTextWidth();
     BOOL			IdleCheckLinks();
 
-    BOOL			ContinueOnlineSpelling();	// TRUE = etwas gefunden
+    BOOL			ContinueOnlineSpelling();	// TRUE = found s.th.
 
     BOOL			IsIdleDisabled() const		{ return bIdleDisabled; }
     void			DisableIdle(BOOL bDo)		{ bIdleDisabled = bDo; }
@@ -1521,7 +1523,7 @@ public:
     sal_Bool        HasRangeOverflow() const                { return nRangeOverflowType != 0; }
     SC_DLLPUBLIC sal_uInt32      GetRangeOverflowType() const            { return nRangeOverflowType; }
 
-    // fuer Broadcasting/Listening
+    // for broadcasting/listening
     void			SetNoSetDirty( BOOL bVal ) { bNoSetDirty = bVal; }
     BOOL			GetNoSetDirty() const { return bNoSetDirty; }
     void			SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; }
@@ -1797,7 +1799,7 @@ public:
     void RemoveSubTotalCell(ScFormulaCell* pCell);
     void SetSubTotalCellsDirty(const ScRange& rDirtyRange);
 
-private: // CLOOK-Impl-Methoden
+private: // CLOOK-Impl-methods
 
     /**
      * Use this class as a locale variable to merge number formatter from
@@ -1816,7 +1818,7 @@ private: // CLOOK-Impl-Methoden
 
     void    MergeNumberFormatter(ScDocument* pSrcDoc);
 
-    void	ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen?
+    void	ImplCreateOptions(); // Suggestion: switch to on-demand?
     void	ImplDeleteOptions();
 
     void	DeleteDrawLayer();


More information about the Libreoffice-commits mailing list