[PATCH 1/2] Translated comments from German to English
Christina Rossmanith
ChrRossmanith at web.de
Thu Jan 6 12:58:26 PST 2011
---
sc/inc/arealink.hxx | 4 +
sc/inc/chgtrack.hxx | 22 +++
sc/inc/column.hxx | 453 +++++++++++++++++++++++++-------------------------
sc/inc/dbcolect.hxx | 18 +-
sc/inc/dociter.hxx | 39 +++--
sc/inc/docoptio.hxx | 24 ++--
sc/inc/docpool.hxx | 2 +-
sc/inc/document.hxx | 123 +++++++-------
sc/inc/drawpage.hxx | 2 +-
sc/inc/scabstdlg.hxx | 2 +-
sc/inc/table.hxx | 3 +-
sc/inc/waitoff.hxx | 6 +-
12 files changed, 362 insertions(+), 336 deletions(-)
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index b45c207..32905aa 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -51,7 +51,11 @@ private:
ScRange aDestArea;
BOOL bAddUndo;
BOOL bInCreate;
+<<<<<<< HEAD
+ BOOL bDoInsert; // is set to FALSE for first update
+=======
BOOL bDoInsert; // is set to FALSE for first update (Is that comment correct? Can't find statement containing "bDoInsert" and "FALSE" using grok)
+>>>>>>> Translated comments from German to English.
BOOL FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName );
public:
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 6ddc527..5feed9a 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -1264,13 +1264,20 @@ public:
SC_DLLPUBLIC void Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge = false );
+<<<<<<< HEAD
// adjust references for MergeDocument
//! may only be used in a temporary opened document.
//! the Track (?) is unclean afterwards
+=======
+ // for MergeDocument, adjust references,
+ //! may only be used in a temporary opened document
+ //! der Track ist danach verhunzt
+>>>>>>> Translated comments from German to English.
void MergePrepare( ScChangeAction* pFirstMerge, bool bShared = false );
void MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared = false );
static BOOL MergeIgnore( const ScChangeAction&, ULONG nFirstMerge );
+<<<<<<< HEAD
// This comment was already really strange in German.
// Tried to structure it a little. Hope no information got lost...
//
@@ -1291,6 +1298,21 @@ public:
// With bAllFlat (==TRUE ?) all dependents of dependents
// will be inserted flatly.
+=======
+ // Insert dependents into table.
+ // Bei Insert sind es echte Abhaengige,
+ // bei Move abhaengige Contents im FromRange
+ // und geloeschte im ToRange bzw. Inserts in
+ // FromRange oder ToRange,
+ // bei Delete eine Liste der geloeschten,
+ // bei Content andere Contents an gleicher
+ // Position oder MatrixReferences zu MatrixOrigin.
+ // Mit bListMasterDelete werden unter einem
+ // MasterDelete alle zu diesem Delete gehoerenden
+ // Deletes einer Reihe gelistet.
+ // Mit bAllFlat werden auch alle Abhaengigen
+ // der Abhaengigen flach eingefuegt.
+>>>>>>> Translated comments from German to English.
SC_DLLPUBLIC void GetDependents( ScChangeAction*,
ScChangeActionTable&,
BOOL bListMasterDelete = FALSE,
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index de4f36f..35d26b0 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -33,7 +33,6 @@
#include "global.hxx"
#include "address.hxx"
#include "rangenam.hxx"
-#include <tools/solar.h>
#include <set>
@@ -71,48 +70,48 @@ class ScFlatBoolRowSegments;
struct ScSetStringParam;
struct ScColWidthParam;
-#define COLUMN_DELTA 4
+#define COLUMN_DELTA 4
struct ScNeededSizeOptions
{
- const ScPatternAttr* pPattern;
- BOOL bFormula;
- BOOL bSkipMerged;
- BOOL bGetFont;
- BOOL bTotalSize;
+ const ScPatternAttr* pPattern;
+ bool bFormula;
+ bool bSkipMerged;
+ bool bGetFont;
+ bool bTotalSize;
ScNeededSizeOptions()
{
pPattern = NULL;
- bFormula = FALSE;
- bSkipMerged = TRUE;
- bGetFont = TRUE;
- bTotalSize = FALSE;
+ bFormula = false;
+ bSkipMerged = true;
+ bGetFont = true;
+ bTotalSize = false;
}
};
struct ColEntry
{
- SCROW nRow;
- ScBaseCell* pCell;
+ SCROW nRow;
+ ScBaseCell* pCell;
};
class ScColumn
{
private:
- SCCOL nCol;
- SCTAB nTab;
+ SCCOL nCol;
+ SCTAB nTab;
- SCSIZE nCount;
- SCSIZE nLimit;
- ColEntry* pItems;
+ SCSIZE nCount;
+ SCSIZE nLimit;
+ ColEntry* pItems;
- ScAttrArray* pAttrArray;
- ScDocument* pDocument;
+ ScAttrArray* pAttrArray;
+ ScDocument* pDocument;
-friend class ScDocument; // for FillInfo
+friend class ScDocument; // for FillInfo
friend class ScDocumentIterator;
friend class ScValueIterator;
friend class ScDBQueryDataIterator;
@@ -124,7 +123,7 @@ friend class ScHorizontalCellIterator;
friend class ScHorizontalAttrIterator;
public:
- static bool bDoubleAlloc; // for Import: double size for alloc
+ static bool bDoubleAlloc; // for Import: double size for alloc
class DoubleAllocSwitch
{
@@ -138,132 +137,132 @@ public:
ScColumn();
~ScColumn();
- void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc);
-
- BOOL Search( SCROW nRow, SCSIZE& nIndex ) const;
- ScBaseCell* GetCell( SCROW nRow ) const;
- void Insert( SCROW nRow, ScBaseCell* pCell );
- void Insert( SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell );
- void Append( SCROW nRow, ScBaseCell* pCell );
- void Delete( SCROW nRow );
- void DeleteAtIndex( SCSIZE nIndex );
- void FreeAll();
- void Resize( SCSIZE nSize );
- void SwapRow( SCROW nRow1, SCROW nRow2 );
- void SwapCell( SCROW nRow, ScColumn& rCol);
-
- bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const;
- BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const;
- BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
+ void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc);
+
+ bool Search( SCROW nRow, SCSIZE& nIndex ) const;
+ ScBaseCell* GetCell( SCROW nRow ) const;
+ void Insert( SCROW nRow, ScBaseCell* pCell );
+ void Insert( SCROW nRow, sal_uInt32 nFormatIndex, ScBaseCell* pCell );
+ void Append( SCROW nRow, ScBaseCell* pCell );
+ void Delete( SCROW nRow );
+ void DeleteAtIndex( SCSIZE nIndex );
+ void FreeAll();
+ void Resize( SCSIZE nSize );
+ void SwapRow( SCROW nRow1, SCROW nRow2 );
+ void SwapCell( SCROW nRow, ScColumn& rCol);
+
+ bool HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
+ bool HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const;
+ bool ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
SCCOL& rPaintCol, SCROW& rPaintRow,
- BOOL bRefresh, BOOL bAttrs );
+ bool bRefresh, bool bAttrs );
- BOOL IsEmptyVisData(BOOL bNotes) const; // without Broadcaster
- BOOL IsEmptyData() const;
- BOOL IsEmptyAttr() const;
- BOOL IsEmpty() const;
+ bool IsEmptyVisData(bool bNotes) const; // without Broadcaster
+ bool IsEmptyData() const;
+ bool IsEmptyAttr() const;
+ bool IsEmpty() const;
// data only:
- BOOL IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const;
- SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const;
- BOOL HasDataAt(SCROW nRow) const;
- BOOL HasVisibleDataAt(SCROW nRow) const;
- SCROW GetFirstDataPos() const;
- SCROW GetLastDataPos() const;
- SCROW GetLastVisDataPos(BOOL bNotes) const; // without Broadcaster
- SCROW GetFirstVisDataPos(BOOL bNotes) const;
- BOOL GetPrevDataPos(SCROW& rRow) const;
- BOOL GetNextDataPos(SCROW& rRow) const;
- void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (without Broadcaster)
- void FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const;
-
- SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const;
-
- USHORT GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const;
- BOOL HasSelectionMatrixFragment(const ScMarkData& rMark) const;
-
- BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const;
- BOOL GetLastVisibleAttr( SCROW& rLastRow ) const;
- BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
- BOOL IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,
+ bool IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const;
+ SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const;
+ bool HasDataAt(SCROW nRow) const;
+ bool HasVisibleDataAt(SCROW nRow) const;
+ SCROW GetFirstDataPos() const;
+ SCROW GetLastDataPos() const;
+ SCROW GetLastVisDataPos(bool bNotes) const; // without Broadcaster
+ SCROW GetFirstVisDataPos(bool bNotes) const;
+ bool GetPrevDataPos(SCROW& rRow) const;
+ bool GetNextDataPos(SCROW& rRow) const;
+ void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (without Broadcaster)
+ void FindUsed( SCROW nStartRow, SCROW nEndRow, bool* pUsed ) const;
+
+ SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const;
+ sal_uInt16 GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
+ bool HasSelectionMatrixFragment(const ScMarkData& rMark) const;
+
+ bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;
+ bool GetLastVisibleAttr( SCROW& rLastRow ) const;
+ bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
+ bool IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,
SCROW nEndRow = MAXROW ) const;
- BOOL IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const;
-
- BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
- BOOL TestInsertRow( SCSIZE nSize ) const;
- void InsertRow( SCROW nStartRow, SCSIZE nSize );
- void DeleteRow( SCROW nStartRow, SCSIZE nSize );
- void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFlag );
- void DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag );
- void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions);
- void CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
- USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScColumn& rColumn);
- void StartListeningInArea( SCROW nRow1, SCROW nRow2 );
- void BroadcastInArea( SCROW nRow1, SCROW nRow2 );
-
- void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
-
- // Selection (?) of this document
- void MixMarked( const ScMarkData& rMark, USHORT nFunction,
- BOOL bSkipEmpty, ScColumn& rSrcCol );
- void MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty,
+ bool IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const;
+
+ bool TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
+ bool TestInsertRow( SCSIZE nSize ) const;
+ void InsertRow( SCROW nStartRow, SCSIZE nSize );
+ void DeleteRow( SCROW nStartRow, SCSIZE nSize );
+ void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDelFlag );
+ void DeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag );
+ void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, bool bKeepScenarioFlags, bool bCloneNoteCaptions);
+ void CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
+ sal_uInt16 nInsFlag, bool bAsLink, bool bSkipAttrForEmpty, ScColumn& rColumn);
+ void StartListeningInArea( SCROW nRow1, SCROW nRow2 );
+ void BroadcastInArea( SCROW nRow1, SCROW nRow2 );
+
+ void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
+
+ // Selection (?) of this document
+ void MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
+ bool bSkipEmpty, ScColumn& rSrcCol );
+ void MixData( SCROW nRow1, SCROW nRow2, sal_uInt16 nFunction, bool bSkipEmpty,
ScColumn& rSrcCol );
- ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos,
- SCSIZE nIndex, USHORT nFlags ) const;
+ ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos,
+ SCSIZE nIndex, sal_uInt16 nFlags ) const;
ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const;
- SCCOL GetCol() const { return nCol; }
- // UpdateSelectionFunction: multi-select
- void UpdateSelectionFunction( const ScMarkData& rMark,
+ SCCOL GetCol() const { return nCol; }
+
+ // UpdateSelectionFunction: multi-select
+ void UpdateSelectionFunction( const ScMarkData& rMark,
ScFunctionData& rData,
ScFlatBoolRowSegments& rHiddenRows,
- BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
- void UpdateAreaFunction( ScFunctionData& rData,
+ bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
+ void UpdateAreaFunction( ScFunctionData& rData,
ScFlatBoolRowSegments& rHiddenRows,
SCROW nStartRow, SCROW nEndRow );
- void CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+ void CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bMarked,
ScColumn& rColumn, const ScMarkData* pMarkData = NULL,
- BOOL bAsLink = FALSE );
- void UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+ bool bAsLink = false );
+ void UndoToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bMarked,
ScColumn& rColumn, const ScMarkData* pMarkData = NULL );
- void CopyScenarioFrom( const ScColumn& rSrcCol );
- void CopyScenarioTo( ScColumn& rDestCol ) const;
- BOOL TestCopyScenarioTo( const ScColumn& rDestCol ) const;
- void MarkScenarioIn( ScMarkData& rDestMark ) const;
+ void CopyScenarioFrom( const ScColumn& rSrcCol );
+ void CopyScenarioTo( ScColumn& rDestCol ) const;
+ bool TestCopyScenarioTo( const ScColumn& rDestCol ) const;
+ void MarkScenarioIn( ScMarkData& rDestMark ) const;
+
+ void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const;
- void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const;
+ void SwapCol(ScColumn& rCol);
+ void MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol);
- void SwapCol(ScColumn& rCol);
- void MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol);
- BOOL HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const;
+ bool HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const;
- // TRUE = format for numbers is set
- BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString,
+ // TRUE = format for numbers is set
+ bool SetString( SCROW nRow, SCTAB nTab, const String& rString,
formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO,
ScSetStringParam* pParam = NULL );
- void SetValue( SCROW nRow, const double& rVal);
- void SetError( SCROW nRow, const USHORT nError);
-
- void GetString( SCROW nRow, String& rString ) const;
- void GetInputString( SCROW nRow, String& rString ) const;
- double GetValue( SCROW nRow ) const;
- void GetFormula( SCROW nRow, String& rFormula,
- BOOL bAsciiExport = FALSE ) const;
- CellType GetCellType( SCROW nRow ) const;
- SCSIZE GetCellCount() const { return nCount; }
- ULONG GetWeightedCount() const;
- ULONG GetCodeCount() const; // RPN-Code in formulas
- USHORT GetErrCode( SCROW nRow ) const;
-
- BOOL HasStringData( SCROW nRow ) const;
- BOOL HasValueData( SCROW nRow ) const;
- BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const;
+ void SetValue( SCROW nRow, const double& rVal);
+ void SetError( SCROW nRow, const sal_uInt16 nError);
+
+ void GetString( SCROW nRow, String& rString ) const;
+ void GetInputString( SCROW nRow, String& rString ) const;
+ double GetValue( SCROW nRow ) const;
+ void GetFormula( SCROW nRow, String& rFormula ) const;
+ CellType GetCellType( SCROW nRow ) const;
+ SCSIZE GetCellCount() const { return nCount; }
+ sal_uInt32 GetWeightedCount() const;
+ sal_uInt32 GetCodeCount() const; // RPN-Code in formulas
+ sal_uInt16 GetErrCode( SCROW nRow ) const;
+
+ bool HasStringData( SCROW nRow ) const;
+ bool HasValueData( SCROW nRow ) const;
+ bool HasStringCells( SCROW nStartRow, SCROW nEndRow ) const;
/** Returns the pointer to a cell note object at the passed row. */
ScPostIt* GetNote( SCROW nRow );
@@ -274,176 +273,176 @@ public:
/** Deletes the note at the passed row. */
void DeleteNote( SCROW nRow );
- void SetDirty();
- void SetDirty( const ScRange& );
- void SetDirtyVar();
- void SetDirtyAfterLoad();
- void SetTableOpDirty( const ScRange& );
- void CalcAll();
- void CalcAfterLoad();
- void CompileAll();
- void CompileXML( ScProgress& rProgress );
+ void SetDirty();
+ void SetDirty( const ScRange& );
+ void SetDirtyVar();
+ void SetDirtyAfterLoad();
+ void SetTableOpDirty( const ScRange& );
+ void CalcAll();
+ void CalcAfterLoad();
+ void CompileAll();
+ void CompileXML( ScProgress& rProgress );
- void ResetChanged( SCROW nStartRow, SCROW nEndRow );
+ void ResetChanged( SCROW nStartRow, SCROW nEndRow );
- void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+ void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
ScDocument* pUndoDoc = NULL );
- void UpdateInsertTab( SCTAB nTable);
- void UpdateInsertTabOnlyCells( SCTAB nTable);
- void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL );
- void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
- void UpdateCompile( BOOL bForceIfNameInUse = FALSE );
- void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest,
+ void UpdateInsertTab( SCTAB nTable);
+ void UpdateInsertTabOnlyCells( SCTAB nTable);
+ void UpdateDeleteTab( SCTAB nTable, bool bIsMove, ScColumn* pRefUndo = NULL );
+ void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
+ void UpdateCompile( bool bForceIfNameInUse = false );
+ void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest,
ScDocument* pUndoDoc );
- void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY );
+ void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY );
- void SetTabNo(SCTAB nNewTab);
- BOOL IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const;
- void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const;
- void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap );
+ void SetTabNo(SCTAB nNewTab);
+ bool IsRangeNameInUse(SCROW nRow1, SCROW nRow2, sal_uInt16 nIndex) const;
+ void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes) const;
+ void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap );
- const SfxPoolItem* GetAttr( SCROW nRow, USHORT nWhich ) const;
- const ScPatternAttr* GetPattern( SCROW nRow ) const;
+ const SfxPoolItem* GetAttr( SCROW nRow, sal_uInt16 nWhich ) const;
+ const ScPatternAttr* GetPattern( SCROW nRow ) const;
const ScPatternAttr* GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const;
- ULONG GetNumberFormat( SCROW nRow ) const;
+ sal_uInt32 GetNumberFormat( SCROW nRow ) const;
sal_uInt32 GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const;
- void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const;
- void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const;
- void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
+ void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, bool bDeep ) const;
+ void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, bool bDeep ) const;
+ void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
ScLineFlags& rFlags,
- SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const;
- void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
- SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight );
+ SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) const;
+ void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
+ SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight );
- void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr );
- void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr );
- void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr,
+ void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr );
+ void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr );
+ void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr,
ScEditDataArray* pDataArray = NULL );
bool SetAttrEntries(ScAttrEntry* pData, SCSIZE nSize);
- void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE );
- void SetPatternArea( SCROW nStartRow, SCROW nEndRow,
- const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE );
- void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
+ void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, bool bPutToPool = false );
+ void SetPatternArea( SCROW nStartRow, SCROW nEndRow,
+ const ScPatternAttr& rPatAttr, bool bPutToPool = false );
+ void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
const ScPatternAttr& rPattern, short nNewType );
- void ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle );
- void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle );
- void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark);
- void ApplySelectionLineStyle( const ScMarkData& rMark,
- const SvxBorderLine* pLine, BOOL bColorOnly );
+ void ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle );
+ void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle );
+ void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark);
+ void ApplySelectionLineStyle( const ScMarkData& rMark,
+ const SvxBorderLine* pLine, bool bColorOnly );
- const ScStyleSheet* GetStyle( SCROW nRow ) const;
- const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const;
- const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const;
+ const ScStyleSheet* GetStyle( SCROW nRow ) const;
+ const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const;
+ const ScStyleSheet* GetAreaStyle( bool& rFound, SCROW nRow1, SCROW nRow2 ) const;
- void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
- BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
+ void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
+ bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
/// May return -1 if not found
- SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
- BOOL bUp, BOOL bInSelection, const ScMarkData& rMark );
- BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
- BOOL bUp, BOOL bInSelection, const ScMarkData& rMark );
+ SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
+ bool bUp, bool bInSelection, const ScMarkData& rMark );
+ bool SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
+ bool bUp, bool bInSelection, const ScMarkData& rMark );
- BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags );
- BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags );
- void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich );
+ bool ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
+ bool RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
+ void ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich );
- void RemoveProtected( SCROW nStartRow, SCROW nEndRow );
+ void RemoveProtected( SCROW nStartRow, SCROW nEndRow );
- SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
- void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
+ SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
+ void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark );
- void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
- void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark );
+ void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
+ void ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark );
- long GetNeededSize( SCROW nRow, OutputDevice* pDev,
+ long GetNeededSize( SCROW nRow, OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bWidth, const ScNeededSizeOptions& rOptions );
- USHORT GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
+ bool bWidth, const ScNeededSizeOptions& rOptions );
+ sal_uInt16 GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bFormula, USHORT nOldWidth,
+ bool bFormula, sal_uInt16 nOldWidth,
const ScMarkData* pMarkData,
const ScColWidthParam* pParam );
- void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight,
+ void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bShrink, USHORT nMinHeight, SCROW nMinStart );
+ bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart );
private:
- long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
- BOOL bWidth );
+ long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
+ bool bWidth );
public:
/// Including current, may return -1
- SCsROW GetNextUnprotected( SCROW nRow, BOOL bUp ) const;
+ SCsROW GetNextUnprotected( SCROW nRow, bool bUp ) const;
- void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates);
- BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
+ void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates);
+ bool GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, bool bLimit);
- void UpdateInsertTabAbs(SCTAB nNewPos);
- BOOL TestTabRefAbs(SCTAB nTable);
- BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const;
+ void UpdateInsertTabAbs(SCTAB nNewPos);
+ bool TestTabRefAbs(SCTAB nTable);
+ bool GetNextSpellingCell(SCROW& nRow, bool bInSel, const ScMarkData& rData) const;
- void RemoveAutoSpellObj();
+ void RemoveAutoSpellObj();
- void StartListening( SvtListener& rLst, SCROW nRow );
- void EndListening( SvtListener& rLst, SCROW nRow );
- void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow );
- void StartAllListeners();
- void StartNeededListeners(); // only for cells where NeedsListening()==TRUE
- void SetRelNameDirty();
+ void StartListening( SvtListener& rLst, SCROW nRow );
+ void EndListening( SvtListener& rLst, SCROW nRow );
+ void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow );
+ void StartAllListeners();
+ void StartNeededListeners(); // only for cells where NeedsListening()==true
+ void SetRelNameDirty();
- void CompileDBFormula();
- void CompileDBFormula( BOOL bCreateFormulaString );
- void CompileNameFormula( BOOL bCreateFormulaString );
- void CompileColRowNameFormula();
+ void CompileDBFormula();
+ void CompileDBFormula( bool bCreateFormulaString );
+ void CompileNameFormula( bool bCreateFormulaString );
+ void CompileColRowNameFormula();
- sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const;
+ sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const;
xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision,
SCROW nRowStart, SCROW nRowEnd ) const;
private:
- ScBaseCell* CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos);
+ ScBaseCell* CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos);
};
-class ScColumnIterator // walk through all data of a area/range
+class ScColumnIterator // walk through all data of a area/range
{
- const ScColumn* pColumn;
- SCSIZE nPos;
- SCROW nTop;
- SCROW nBottom;
+ const ScColumn* pColumn;
+ SCSIZE nPos;
+ SCROW nTop;
+ SCROW nBottom;
public:
ScColumnIterator( const ScColumn* pCol, SCROW nStart=0, SCROW nEnd=MAXROW );
~ScColumnIterator();
- BOOL Next( SCROW& rRow, ScBaseCell*& rpCell );
- SCSIZE GetIndex() const;
+ bool Next( SCROW& rRow, ScBaseCell*& rpCell );
+ SCSIZE GetIndex() const;
};
-class ScMarkedDataIter // walk through data in a selected area/range
+class ScMarkedDataIter // walk through data in a selected area/range
{
- const ScColumn* pColumn;
- SCSIZE nPos;
- ScMarkArrayIter* pMarkIter;
- SCROW nTop;
- SCROW nBottom;
- BOOL bNext;
- BOOL bAll;
+ const ScColumn* pColumn;
+ SCSIZE nPos;
+ ScMarkArrayIter* pMarkIter;
+ SCROW nTop;
+ SCROW nBottom;
+ bool bNext;
+ bool bAll;
public:
ScMarkedDataIter( const ScColumn* pCol, const ScMarkData* pMarkData,
- BOOL bAllIfNone = FALSE );
+ bool bAllIfNone = false );
~ScMarkedDataIter();
- BOOL Next( SCSIZE& rIndex );
+ bool Next( SCSIZE& rIndex );
};
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx
index 95d2649..8715505 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 ) // above 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..e3d55ae 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 3401e54..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);
@@ -778,8 +779,7 @@ public:
may be NULL. */
SC_DLLPUBLIC void GetNumberFormatInfo( short& nType, ULONG& nIndex,
const ScAddress& rPos, const ScBaseCell* pCell ) const;
- void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula,
- BOOL bAsciiExport = FALSE ) const;
+ void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula ) const;
SC_DLLPUBLIC void GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const;
SC_DLLPUBLIC CellType GetCellType( const ScAddress& rPos ) const;
SC_DLLPUBLIC void GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const;
@@ -829,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 );
@@ -881,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
@@ -1079,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,
@@ -1244,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 );
@@ -1408,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 );
@@ -1498,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; }
@@ -1522,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; }
@@ -1798,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
@@ -1817,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();
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index faa43fa..edbe656 100644
--- a/sc/inc/drawpage.hxx
+++ b/sc/inc/drawpage.hxx
@@ -39,7 +39,7 @@ class ScDrawLayer;
class ScDrawPage: public FmFormPage
{
public:
- ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, BOOL bMasterPage=FALSE);
+ ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, bool bMasterPage = false);
~ScDrawPage();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index cd8b197..3584805 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -212,7 +212,7 @@ class AbstractScMoveTableDlg : public VclAbstractDialog //add for ScMoveTableDl
public:
virtual USHORT GetSelectedDocument () const = 0;
virtual USHORT GetSelectedTable () const = 0;
- virtual BOOL GetCopyTable () const = 0;
+ virtual bool GetCopyTable () const = 0;
virtual bool GetRenameTable () const = 0;
virtual void GetTabNameString( String& rString ) const = 0;
virtual void SetForceCopyTable () = 0;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2a0db50..b402c5c 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -319,8 +319,7 @@ public:
0.0;
}
double GetValue( SCCOL nCol, SCROW nRow );
- void GetFormula( SCCOL nCol, SCROW nRow, String& rFormula,
- BOOL bAsciiExport = FALSE );
+ void GetFormula( SCCOL nCol, SCROW nRow, String& rFormula );
CellType GetCellType( const ScAddress& rPos ) const
{
diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx
index d58f1cd..5090399 100644
--- a/sc/inc/waitoff.hxx
+++ b/sc/inc/waitoff.hxx
@@ -29,15 +29,15 @@
#ifndef SC_WAITOFF_HXX
#define SC_WAITOFF_HXX
-#include <tools/solar.h>
+#include <sal/types.h>
class Window;
class ScWaitCursorOff
{
private:
- Window* pWin;
- ULONG nWaiters;
+ Window* pWin;
+ sal_uInt32 nWaiters;
public:
ScWaitCursorOff( Window* pWin );
~ScWaitCursorOff();
--
1.7.0.4
--------------040005070304010303030901
Content-Type: text/x-patch;
name="0002-Translated-comments-from-German-to-English.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0002-Translated-comments-from-German-to-English.patch"
More information about the LibreOffice
mailing list