[Libreoffice-commits] .: 4 commits - sc/inc sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Mon Jan 3 20:33:17 PST 2011
sc/inc/column.hxx | 452 +++++++++++++++++++--------------------
sc/inc/document.hxx | 3
sc/inc/table.hxx | 3
sc/source/core/data/column.cxx | 246 ++++++++++-----------
sc/source/core/data/column2.cxx | 322 +++++++++++++--------------
sc/source/core/data/column3.cxx | 260 +++++++++++-----------
sc/source/core/data/document.cxx | 5
sc/source/core/data/table2.cxx | 11
sc/source/ui/docshell/impex.cxx | 2
9 files changed, 649 insertions(+), 655 deletions(-)
New commits:
commit 69549214b2464831a728b0792db909f178e17f8b
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Jan 3 23:31:12 2011 -0500
Let's use sal_uInt32 over sal_uIntPtr.
In most uses of ULONG, ULONG isn't really expected to be 64-bit in
size when in 64-bit platforms. Substituting it with 32-bit integer
is sufficient.
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7e111bc..9a4e41c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -142,7 +142,7 @@ public:
bool Search( SCROW nRow, SCSIZE& nIndex ) const;
ScBaseCell* GetCell( SCROW nRow ) const;
void Insert( SCROW nRow, ScBaseCell* pCell );
- void Insert( SCROW nRow, sal_uIntPtr nFormatIndex, 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 );
@@ -255,8 +255,8 @@ public:
void GetFormula( SCROW nRow, String& rFormula ) const;
CellType GetCellType( SCROW nRow ) const;
SCSIZE GetCellCount() const { return nCount; }
- sal_uIntPtr GetWeightedCount() const;
- sal_uIntPtr GetCodeCount() const; // RPN-Code in Formeln
+ sal_uInt32 GetWeightedCount() const;
+ sal_uInt32 GetCodeCount() const; // RPN-Code in Formeln
sal_uInt16 GetErrCode( SCROW nRow ) const;
bool HasStringData( SCROW nRow ) const;
@@ -306,7 +306,7 @@ public:
const ScPatternAttr* GetPattern( SCROW nRow ) const;
const ScPatternAttr* GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const;
- sal_uIntPtr 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;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 042e849..77f585a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -377,7 +377,7 @@ sal_uInt32 ScColumn::GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const
}
-sal_uIntPtr ScColumn::GetNumberFormat( SCROW nRow ) const
+sal_uInt32 ScColumn::GetNumberFormat( SCROW nRow ) const
{
return pAttrArray->GetPattern( nRow )->GetNumberFormat( pDocument->GetFormatTable() );
}
@@ -493,7 +493,7 @@ void ScColumn::ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
SCROW nRow1, nRow2;
const ScPatternAttr* pPattern = pAttrArray->GetPatternRange(
nRow1, nRow2, nRow );
- sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter );
+ sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter );
short nOldType = pFormatter->GetType( nFormat );
if ( nOldType == nNewType || pFormatter->IsCompatible( nOldType, nNewType ) )
nRow = nRow2;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 3ea3f06..180cc31 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -246,7 +246,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
String aValStr;
Color* pColor;
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
+ sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
ScCellFormat::GetString( pCell, nFormat, aValStr, &pColor,
*pFormatter,
true, rOptions.bFormula, ftCheck );
@@ -407,7 +407,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
{
Color* pColor;
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
+ sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
String aString;
ScCellFormat::GetString( pCell, nFormat, aString, &pColor,
*pFormatter,
@@ -536,7 +536,7 @@ long ScColumn::GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
String aValStr;
Color* pColor;
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter );
+ sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter );
ScCellFormat::GetString( pCell, nFormat, aValStr, &pColor,
*pFormatter, true, false, ftCheck );
if ( aValStr.Len() )
@@ -577,7 +577,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, doubl
// Try to find the row that has the longest string, and measure the width of that string.
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter );
+ sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter );
String aLongStr;
Color* pColor;
if (pParam->mnMaxTextRow >= 0)
@@ -1005,8 +1005,8 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow )
if ( bNeedObject ) // bleibt Edit-Zelle
{
- sal_uIntPtr nCtrl = pEngine->GetControlWord();
- sal_uIntPtr nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
+ sal_uInt32 nCtrl = pEngine->GetControlWord();
+ sal_uInt32 nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
if ( ( nCtrl & EE_CNTRL_ALLOWBIGOBJS ) != nWantBig )
pEngine->SetControlWord( (nCtrl & ~EE_CNTRL_ALLOWBIGOBJS) | nWantBig );
EditTextObject* pNewData = pEngine->CreateTextObject();
@@ -1740,9 +1740,9 @@ void ScColumn::UpdateAreaFunction( ScFunctionData& rData,
}
}
-sal_uIntPtr ScColumn::GetWeightedCount() const
+sal_uInt32 ScColumn::GetWeightedCount() const
{
- sal_uIntPtr nTotal = 0;
+ sal_uInt32 nTotal = 0;
// Notizen werden nicht gezaehlt
@@ -1771,9 +1771,9 @@ sal_uIntPtr ScColumn::GetWeightedCount() const
return nTotal;
}
-sal_uIntPtr ScColumn::GetCodeCount() const
+sal_uInt32 ScColumn::GetCodeCount() const
{
- sal_uIntPtr nCodeCount = 0;
+ sal_uInt32 nCodeCount = 0;
for (SCSIZE i=0; i<nCount; i++)
{
commit 4d4f99c68cc232ad788c748e4cd717e4c05922e8
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Jan 3 23:11:29 2011 -0500
Converted tabs to whitespaces.
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 9fddb90..7e111bc 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -70,16 +70,16 @@ 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()
{
@@ -93,25 +93,25 @@ struct ScNeededSizeOptions
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; // fuer FillInfo
+friend class ScDocument; // fuer FillInfo
friend class ScDocumentIterator;
friend class ScValueIterator;
friend class ScDBQueryDataIterator;
@@ -123,7 +123,7 @@ friend class ScHorizontalCellIterator;
friend class ScHorizontalAttrIterator;
public:
- static bool bDoubleAlloc; // fuer Import: Groesse beim Allozieren verdoppeln
+ static bool bDoubleAlloc; // fuer Import: Groesse beim Allozieren verdoppeln
class DoubleAllocSwitch
{
@@ -137,131 +137,131 @@ public:
ScColumn();
~ScColumn();
- void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc);
+ 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_uIntPtr 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 Search( SCROW nRow, SCSIZE& nIndex ) const;
+ ScBaseCell* GetCell( SCROW nRow ) const;
+ void Insert( SCROW nRow, ScBaseCell* pCell );
+ void Insert( SCROW nRow, sal_uIntPtr 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,
+ 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 IsEmptyVisData(bool bNotes) const; // ohne Broadcaster
- bool IsEmptyData() const;
- bool IsEmptyAttr() const;
- bool IsEmpty() const;
+ bool IsEmptyVisData(bool bNotes) const; // ohne Broadcaster
+ bool IsEmptyData() const;
+ bool IsEmptyAttr() const;
+ bool IsEmpty() const;
// nur Daten:
- 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; // ohne Broadcaster
- SCROW GetFirstVisDataPos(bool bNotes) const;
- bool GetPrevDataPos(SCROW& rRow) const;
- bool GetNextDataPos(SCROW& rRow) const;
- void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne 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 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; // ohne Broadcaster
+ SCROW GetFirstVisDataPos(bool bNotes) const;
+ bool GetPrevDataPos(SCROW& rRow) const;
+ bool GetNextDataPos(SCROW& rRow) const;
+ void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne 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,
+ 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 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 );
+ 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,
+ 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 StartListeningInArea( SCROW nRow1, SCROW nRow2 );
+ void BroadcastInArea( SCROW nRow1, SCROW nRow2 );
- void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
+ void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
- // Markierung von diesem Dokument
- void MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
+ // Markierung von diesem Dokument
+ void MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
bool bSkipEmpty, ScColumn& rSrcCol );
- void MixData( SCROW nRow1, SCROW nRow2, sal_uInt16 nFunction, bool bSkipEmpty,
+ void MixData( SCROW nRow1, SCROW nRow2, sal_uInt16 nFunction, bool bSkipEmpty,
ScColumn& rSrcCol );
- ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos,
+ 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; }
+ SCCOL GetCol() const { return nCol; }
- // UpdateSelectionFunction: Mehrfachselektion
- void UpdateSelectionFunction( const ScMarkData& rMark,
+ // UpdateSelectionFunction: Mehrfachselektion
+ void UpdateSelectionFunction( const ScMarkData& rMark,
ScFunctionData& rData,
ScFlatBoolRowSegments& rHiddenRows,
bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
- void UpdateAreaFunction( ScFunctionData& rData,
+ void UpdateAreaFunction( ScFunctionData& rData,
ScFlatBoolRowSegments& rHiddenRows,
SCROW nStartRow, SCROW nEndRow );
- void CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 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, sal_uInt16 nFlags, bool bMarked,
+ 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 = Zahlformat gesetzt
- bool SetString( SCROW nRow, SCTAB nTab, const String& rString,
+ // true = Zahlformat gesetzt
+ 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 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_uIntPtr GetWeightedCount() const;
- sal_uIntPtr GetCodeCount() const; // RPN-Code in Formeln
- sal_uInt16 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_uIntPtr GetWeightedCount() const;
+ sal_uIntPtr GetCodeCount() const; // RPN-Code in Formeln
+ 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 );
@@ -272,137 +272,137 @@ 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, sal_uInt16 nIndex) const;
+ 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 );
+ void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap );
- const SfxPoolItem* GetAttr( SCROW nRow, sal_uInt16 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;
- sal_uIntPtr GetNumberFormat( SCROW nRow ) const;
+ sal_uIntPtr 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,
+ 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,
+ 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 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,
+ 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,
+ SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
bool bUp, bool bInSelection, const ScMarkData& rMark );
- bool SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
+ bool SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
bool bUp, bool bInSelection, const ScMarkData& rMark );
- 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 );
+ 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 );
+ SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark );
- void ClearSelectionItems( const sal_uInt16* 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 );
- sal_uInt16 GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
+ sal_uInt16 GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
bool bFormula, sal_uInt16 nOldWidth,
const ScMarkData* pMarkData,
const ScColWidthParam* pParam );
- void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight,
+ void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart );
private:
- long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
+ 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 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 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;
@@ -411,37 +411,37 @@ private:
};
-class ScColumnIterator // alle Daten eines Bereichs durchgehen
+class ScColumnIterator // alle Daten eines Bereichs durchgehen
{
- 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 // Daten in selektierten Bereichen durchgehen
+class ScMarkedDataIter // Daten in selektierten Bereichen durchgehen
{
- 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 );
~ScMarkedDataIter();
- bool Next( SCSIZE& rIndex );
+ bool Next( SCSIZE& rIndex );
};
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 0fd7616..b25ff15 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -47,10 +47,10 @@
#include "formula/errorcodes.hxx"
#include "formula/token.hxx"
#include "brdcst.hxx"
-#include "docoptio.hxx" // GetStdPrecision fuer GetMaxNumberStringLen
+#include "docoptio.hxx" // GetStdPrecision fuer GetMaxNumberStringLen
#include "subtotal.hxx"
#include "markdata.hxx"
-#include "detfunc.hxx" // fuer Notizen bei DeleteRange
+#include "detfunc.hxx" // fuer Notizen bei DeleteRange
#include "postit.hxx"
#include "stringutil.hxx"
#include "docpool.hxx"
@@ -62,7 +62,7 @@ using ::rtl::OUString;
using ::rtl::OUStringBuffer;
// Err527 Workaround
-extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
+extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
using namespace formula;
// STATIC DATA -----------------------------------------------------------
@@ -82,7 +82,7 @@ void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
}
if ( !bIsAppended )
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
{
ScBaseCell* pOldCell = pItems[nIndex].pCell;
@@ -205,13 +205,13 @@ void ScColumn::Append( SCROW nRow, ScBaseCell* pCell )
void ScColumn::Delete( SCROW nRow )
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
{
ScBaseCell* pCell = pItems[nIndex].pCell;
ScNoteCell* pNoteCell = new ScNoteCell;
- pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret
+ pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret
pDocument->Broadcast( ScHint( SC_HINT_DYING,
ScAddress( nCol, nRow, nTab ), pCell ) );
if ( SvtBroadcaster* pBC = pCell->ReleaseBroadcaster() )
@@ -225,7 +225,7 @@ void ScColumn::Delete( SCROW nRow )
memmove( &pItems[nIndex], &pItems[nIndex + 1], (nCount - nIndex) * sizeof(ColEntry) );
pItems[nCount].nRow = 0;
pItems[nCount].pCell = NULL;
- // Soll man hier den Speicher freigeben (delta)? Wird dann langsamer!
+ // Soll man hier den Speicher freigeben (delta)? Wird dann langsamer!
}
pCell->EndListeningTo( pDocument );
pCell->Delete();
@@ -237,7 +237,7 @@ void ScColumn::DeleteAtIndex( SCSIZE nIndex )
{
ScBaseCell* pCell = pItems[nIndex].pCell;
ScNoteCell* pNoteCell = new ScNoteCell;
- pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret
+ pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret
pDocument->Broadcast( ScHint( SC_HINT_DYING,
ScAddress( nCol, pItems[nIndex].nRow, nTab ), pCell ) );
delete pNoteCell;
@@ -277,7 +277,7 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
return ;
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
BOOL bFound=FALSE;
SCROW nEndRow = nStartRow + nSize - 1;
@@ -299,9 +299,9 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
if (pBC)
{
// gibt jetzt invalid reference, kein Aufruecken der direkten Referenzen
-// MoveListeners( *pBC, nRow+nSize );
+// MoveListeners( *pBC, nRow+nSize );
pCell->DeleteBroadcaster();
- // in DeleteRange werden leere Broadcaster geloescht
+ // in DeleteRange werden leere Broadcaster geloescht
}
}
if (bFound)
@@ -551,10 +551,10 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFla
void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag)
{
- // FreeAll darf hier nicht gerufen werden wegen Broadcastern
+ // FreeAll darf hier nicht gerufen werden wegen Broadcastern
- // Attribute erst am Ende, damit vorher noch zwischen Zahlen und Datum
- // unterschieden werden kann (#47901#)
+ // Attribute erst am Ende, damit vorher noch zwischen Zahlen und Datum
+ // unterschieden werden kann (#47901#)
USHORT nContMask = IDF_CONTENTS;
// IDF_NOCAPTIONS needs to be passed too, if IDF_NOTE is set
@@ -592,7 +592,7 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag)
RemoveEditAttribs( nStartRow, nEndRow );
}
- // Attribute erst hier
+ // Attribute erst hier
if ((nDelFlag & IDF_ATTRIB) == IDF_ATTRIB) pAttrArray->DeleteArea( nStartRow, nEndRow );
else if ((nDelFlag & IDF_ATTRIB) != 0) pAttrArray->DeleteHardAttr( nStartRow, nEndRow );
}
@@ -605,8 +605,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r
if (!nContFlags)
return NULL;
- // Testen, ob Zelle kopiert werden soll
- // auch bei IDF_CONTENTS komplett, wegen Notes / Broadcastern
+ // Testen, ob Zelle kopiert werden soll
+ // auch bei IDF_CONTENTS komplett, wegen Notes / Broadcastern
BOOL bMatch = FALSE;
ScBaseCell* pCell = pItems[nIndex].pCell;
@@ -632,8 +632,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r
}
break;
case CELLTYPE_STRING:
- case CELLTYPE_EDIT: bMatch = ((nFlags & IDF_STRING) != 0); break;
- case CELLTYPE_FORMULA: bMatch = ((nFlags & IDF_FORMULA) != 0); break;
+ case CELLTYPE_EDIT: bMatch = ((nFlags & IDF_STRING) != 0); break;
+ case CELLTYPE_FORMULA: bMatch = ((nFlags & IDF_FORMULA) != 0); break;
default:
{
// added to avoid warnings
@@ -643,16 +643,16 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r
return NULL;
- // Referenz einsetzen
+ // Referenz einsetzen
ScSingleRefData aRef;
aRef.nCol = nCol;
aRef.nRow = pItems[nIndex].nRow;
aRef.nTab = nTab;
- aRef.InitFlags(); // -> alles absolut
+ aRef.InitFlags(); // -> alles absolut
aRef.SetFlag3D(TRUE);
- //! 3D(FALSE) und TabRel(TRUE), wenn die endgueltige Position auf der selben Tabelle ist?
- //! (bei TransposeClip ist die Zielposition noch nicht bekannt)
+ //! 3D(FALSE) und TabRel(TRUE), wenn die endgueltige Position auf der selben Tabelle ist?
+ //! (bei TransposeClip ist die Zielposition noch nicht bekannt)
aRef.CalcRelFromAbs( rDestPos );
@@ -663,8 +663,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r
}
-// rColumn = Quelle
-// nRow1, nRow2 = Zielposition
+// rColumn = Quelle
+// nRow1, nRow2 = Zielposition
void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
USHORT nInsFlag, bool bAsLink, bool bSkipAttrForEmpty,
@@ -674,8 +674,8 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
{
if ( bSkipAttrForEmpty )
{
- // copy only attributes for non-empty cells
- // (notes are not counted as non-empty here, to match the content behavior)
+ // copy only attributes for non-empty cells
+ // (notes are not counted as non-empty here, to match the content behavior)
SCSIZE nStartIndex;
rColumn.Search( nRow1-nDy, nStartIndex );
@@ -687,7 +687,7 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
SCROW nStartRow = rColumn.pItems[nStartIndex].nRow;
SCROW nEndRow = nStartRow;
- // find consecutive non-empty cells
+ // find consecutive non-empty cells
while ( nEndRow < nRow2-nDy &&
nEndIndex+1 < rColumn.nCount &&
@@ -711,25 +711,25 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
if ( bAsLink && nInsFlag == IDF_ALL )
{
- // bei "alles" werden auch leere Zellen referenziert
- //! IDF_ALL muss immer mehr Flags enthalten, als bei "Inhalte Einfuegen"
- //! einzeln ausgewaehlt werden koennen!
+ // bei "alles" werden auch leere Zellen referenziert
+ //! IDF_ALL muss immer mehr Flags enthalten, als bei "Inhalte Einfuegen"
+ //! einzeln ausgewaehlt werden koennen!
Resize( nCount + static_cast<SCSIZE>(nRow2-nRow1+1) );
- ScAddress aDestPos( nCol, 0, nTab ); // Row wird angepasst
+ ScAddress aDestPos( nCol, 0, nTab ); // Row wird angepasst
- // Referenz erzeugen (Quell-Position)
+ // Referenz erzeugen (Quell-Position)
ScSingleRefData aRef;
aRef.nCol = rColumn.nCol;
- // nRow wird angepasst
+ // nRow wird angepasst
aRef.nTab = rColumn.nTab;
- aRef.InitFlags(); // -> alles absolut
+ aRef.InitFlags(); // -> alles absolut
aRef.SetFlag3D(TRUE);
for (SCROW nDestRow = nRow1; nDestRow <= nRow2; nDestRow++)
{
- aRef.nRow = nDestRow - nDy; // Quell-Zeile
+ aRef.nRow = nDestRow - nDy; // Quell-Zeile
aDestPos.SetRow( nDestRow );
aRef.CalcRelFromAbs( aDestPos );
@@ -765,8 +765,8 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
bAtEnd = TRUE;
else if ( nDestRow >= (SCsROW) nRow1 )
{
- // rows at the beginning may be skipped if filtered rows are left out,
- // nDestRow may be negative then
+ // rows at the beginning may be skipped if filtered rows are left out,
+ // nDestRow may be negative then
ScAddress aDestPos( nCol, (SCROW)nDestRow, nTab );
@@ -954,7 +954,7 @@ void ScColumn::MixMarked( const ScMarkData& rMark, USHORT nFunction,
}
-// Ergebnis in rVal1
+// Ergebnis in rVal1
BOOL lcl_DoFunction( double& rVal1, double nVal2, USHORT nFunction )
{
@@ -965,7 +965,7 @@ BOOL lcl_DoFunction( double& rVal1, double nVal2, USHORT nFunction )
bOk = SubTotal::SafePlus( rVal1, nVal2 );
break;
case PASTE_SUB:
- nVal2 = -nVal2; //! geht das immer ohne Fehler?
+ nVal2 = -nVal2; //! geht das immer ohne Fehler?
bOk = SubTotal::SafePlus( rVal1, nVal2 );
break;
case PASTE_MUL:
@@ -1007,9 +1007,9 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
SCSIZE nIndex;
Search( nRow1, nIndex );
-// SCSIZE nSrcIndex = 0;
+// SCSIZE nSrcIndex = 0;
SCSIZE nSrcIndex;
- rSrcCol.Search( nRow1, nSrcIndex ); //! Testen, ob Daten ganz vorne
+ rSrcCol.Search( nRow1, nSrcIndex ); //! Testen, ob Daten ganz vorne
SCROW nNextThis = MAXROW+1;
if ( nIndex < nCount )
@@ -1041,14 +1041,14 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
BOOL bSrcEmpty = ( eSrcType == CELLTYPE_NONE || eSrcType == CELLTYPE_NOTE );
BOOL bDestEmpty = ( eDestType == CELLTYPE_NONE || eDestType == CELLTYPE_NOTE );
- if ( bSkipEmpty && bDestEmpty ) // Originalzelle wiederherstellen
+ if ( bSkipEmpty && bDestEmpty ) // Originalzelle wiederherstellen
{
- if ( pSrc ) // war da eine Zelle?
+ if ( pSrc ) // war da eine Zelle?
{
pNew = pSrc->CloneWithoutNote( *pDocument );
}
}
- else if ( nFunction ) // wirklich Rechenfunktion angegeben
+ else if ( nFunction ) // wirklich Rechenfunktion angegeben
{
double nVal1;
double nVal2;
@@ -1061,7 +1061,7 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
else
nVal2 = 0.0;
- // leere Zellen werden als Werte behandelt
+ // leere Zellen werden als Werte behandelt
BOOL bSrcVal = ( bSrcEmpty || eSrcType == CELLTYPE_VALUE );
BOOL bDestVal = ( bDestEmpty || eDestType == CELLTYPE_VALUE );
@@ -1071,15 +1071,15 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
BOOL bDestText = ( eDestType == CELLTYPE_STRING ||
eDestType == CELLTYPE_EDIT );
- // sonst bleibt nur Formel...
+ // sonst bleibt nur Formel...
if ( bSrcEmpty && bDestEmpty )
{
- // beide leer -> nix
+ // beide leer -> nix
}
else if ( bSrcVal && bDestVal )
{
- // neuen Wert eintragen, oder Fehler bei Ueberlauf
+ // neuen Wert eintragen, oder Fehler bei Ueberlauf
BOOL bOk = lcl_DoFunction( nVal1, nVal2, nFunction );
@@ -1090,15 +1090,15 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
ScFormulaCell* pFC = new ScFormulaCell( pDocument,
ScAddress( nCol, nRow, nTab ) );
pFC->SetErrCode( errNoValue );
- //! oder NOVALUE, dann auch in consoli,
- //! sonst in Interpreter::GetCellValue die Abfrage auf errNoValue raus
- //! (dann geht Stringzelle+Wertzelle nicht mehr)
+ //! oder NOVALUE, dann auch in consoli,
+ //! sonst in Interpreter::GetCellValue die Abfrage auf errNoValue raus
+ //! (dann geht Stringzelle+Wertzelle nicht mehr)
pNew = pFC;
}
}
else if ( bSrcText || bDestText )
{
- // mit Texten wird nicht gerechnet - immer "alte" Zelle, also pSrc
+ // mit Texten wird nicht gerechnet - immer "alte" Zelle, also pSrc
if (pSrc)
pNew = pSrc->CloneWithoutNote( *pDocument );
@@ -1107,28 +1107,28 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
}
else
{
- // Kombination aus Wert und mindestens einer Formel -> Formel erzeugen
+ // Kombination aus Wert und mindestens einer Formel -> Formel erzeugen
ScTokenArray aArr;
- // erste Zelle
+ // erste Zelle
if ( eSrcType == CELLTYPE_FORMULA )
lcl_AddCode( aArr, (ScFormulaCell*)pSrc );
else
aArr.AddDouble( nVal1 );
- // Operator
+ // Operator
OpCode eOp = ocAdd;
switch ( nFunction )
{
- case PASTE_ADD: eOp = ocAdd; break;
- case PASTE_SUB: eOp = ocSub; break;
- case PASTE_MUL: eOp = ocMul; break;
- case PASTE_DIV: eOp = ocDiv; break;
+ case PASTE_ADD: eOp = ocAdd; break;
+ case PASTE_SUB: eOp = ocSub; break;
+ case PASTE_MUL: eOp = ocMul; break;
+ case PASTE_DIV: eOp = ocDiv; break;
}
- aArr.AddOpCode(eOp); // Funktion
+ aArr.AddOpCode(eOp); // Funktion
- // zweite Zelle
+ // zweite Zelle
if ( eDestType == CELLTYPE_FORMULA )
lcl_AddCode( aArr, (ScFormulaCell*)pDest );
else
@@ -1139,21 +1139,21 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
}
- if ( pNew || bDelete ) // neues Ergebnis ?
+ if ( pNew || bDelete ) // neues Ergebnis ?
{
- if (pDest && !pNew) // alte Zelle da ?
+ if (pDest && !pNew) // alte Zelle da ?
{
if ( pDest->GetBroadcaster() )
- pNew = new ScNoteCell; // Broadcaster uebernehmen
+ pNew = new ScNoteCell; // Broadcaster uebernehmen
else
- Delete(nRow); // -> loeschen
+ Delete(nRow); // -> loeschen
}
if (pNew)
- Insert(nRow, pNew); // neue einfuegen
+ Insert(nRow, pNew); // neue einfuegen
- Search( nRow, nIndex ); // alles kann sich verschoben haben
+ Search( nRow, nIndex ); // alles kann sich verschoben haben
if (pNew)
- nNextThis = nRow; // nIndex zeigt jetzt genau auf nRow
+ nNextThis = nRow; // nIndex zeigt jetzt genau auf nRow
else
nNextThis = ( nIndex < nCount ) ? pItems[nIndex].nRow : MAXROW+1;
}
@@ -1191,7 +1191,7 @@ void ScColumn::StartAllListeners()
SCROW nRow = pItems[i].nRow;
((ScFormulaCell*)pCell)->StartListeningTo( pDocument );
if ( nRow != pItems[i].nRow )
- Search( nRow, i ); // Listener eingefuegt?
+ Search( nRow, i ); // Listener eingefuegt?
}
}
}
@@ -1212,7 +1212,7 @@ void ScColumn::StartNeededListeners()
SCROW nRow = pItems[i].nRow;
pFCell->StartListeningTo( pDocument );
if ( nRow != pItems[i].nRow )
- Search( nRow, i ); // Listener eingefuegt?
+ Search( nRow, i ); // Listener eingefuegt?
}
}
}
@@ -1254,14 +1254,14 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 )
if ( pCell->GetCellType() == CELLTYPE_FORMULA )
((ScFormulaCell*)pCell)->StartListeningTo( pDocument );
if ( nRow != pItems[nIndex].nRow )
- Search( nRow, nIndex ); // durch Listening eingefuegt
+ Search( nRow, nIndex ); // durch Listening eingefuegt
nIndex++;
}
}
}
-// TRUE = Zahlformat gesetzt
+// TRUE = Zahlformat gesetzt
bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
formula::FormulaGrammar::AddressConvention eConv,
ScSetStringParam* pParam )
@@ -1293,24 +1293,24 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
&& aParam.mpNumFormatter->GetType(nIndex) != NUMBERFORMAT_TEXT )
cFirstChar = rString.GetChar(0);
else
- cFirstChar = 0; // Text
+ cFirstChar = 0; // Text
}
else
- { // waehrend ConvertFrom Import gibt es keine gesetzten Formate
+ { // waehrend ConvertFrom Import gibt es keine gesetzten Formate
cFirstChar = rString.GetChar(0);
}
if ( cFirstChar == '=' )
{
- if ( rString.Len() == 1 ) // = Text
+ if ( rString.Len() == 1 ) // = Text
pNewCell = new ScStringCell( rString );
- else // =Formel
+ else // =Formel
pNewCell = new ScFormulaCell( pDocument,
ScAddress( nCol, nRow, nTabP ), rString,
formula::FormulaGrammar::mergeToGrammar( formula::FormulaGrammar::GRAM_DEFAULT,
eConv), MM_NONE );
}
- else if ( cFirstChar == '\'') // 'Text
+ else if ( cFirstChar == '\'') // 'Text
pNewCell = new ScStringCell( rString.Copy(1) );
else
{
@@ -1335,7 +1335,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
if ( rString == aStr )
bIsText = TRUE;
break;
- case CELLTYPE_NOTE : // durch =Formel referenziert
+ case CELLTYPE_NOTE : // durch =Formel referenziert
break;
default:
if ( i == nCount - 1 )
@@ -1444,7 +1444,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
}
if ( bIsLoading && (!nCount || nRow > pItems[nCount-1].nRow) )
- { // Search einsparen und ohne Umweg ueber Insert, Listener aufbauen
+ { // Search einsparen und ohne Umweg ueber Insert, Listener aufbauen
// und Broadcast kommt eh erst nach dem Laden
if ( pNewCell )
Append( nRow, pNewCell );
@@ -1466,7 +1466,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
if (pBC)
{
pNewCell->TakeBroadcaster(pBC);
- pLastFormulaTreeTop = 0; // Err527 Workaround
+ pLastFormulaTreeTop = 0; // Err527 Workaround
}
if ( pOldCell->GetCellType() == CELLTYPE_FORMULA )
@@ -1477,7 +1477,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
Search(nRow, i);
}
pOldCell->Delete();
- pItems[i].pCell = pNewCell; // ersetzen
+ pItems[i].pCell = pNewCell; // ersetzen
if ( pNewCell->GetCellType() == CELLTYPE_FORMULA )
{
pNewCell->StartListeningTo( pDocument );
@@ -1489,17 +1489,17 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
}
else
{
- DeleteAtIndex(i); // loeschen und Broadcast
+ DeleteAtIndex(i); // loeschen und Broadcast
}
}
else if (pNewCell)
{
- Insert(nRow, pNewCell); // neu eintragen und Broadcast
+ Insert(nRow, pNewCell); // neu eintragen und Broadcast
}
}
- // hier keine Formate mehr fuer Formeln setzen!
- // (werden bei der Ausgabe abgefragt)
+ // hier keine Formate mehr fuer Formeln setzen!
+ // (werden bei der Ausgabe abgefragt)
}
return bNumFmtSet;
@@ -1518,9 +1518,9 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : FALSE )
{
- ScBaseCell* pCell = pItems[nIndex].pCell;
- TypedStrData* pData;
- ULONG nFormat = GetNumberFormat( nRow );
+ ScBaseCell* pCell = pItems[nIndex].pCell;
+ TypedStrData* pData;
+ ULONG nFormat = GetNumberFormat( nRow );
ScCellFormat::GetInputString( pCell, nFormat, aString, *pFormatter );
@@ -1560,7 +1560,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
}
if ( !rStrings.Insert( pData ) )
- delete pData; // doppelt
+ delete pData; // doppelt
++nIndex;
}
@@ -1569,13 +1569,13 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
}
//
-// GetDataEntries - Strings aus zusammenhaengendem Bereich um nRow
+// GetDataEntries - Strings aus zusammenhaengendem Bereich um nRow
//
-// DATENT_MAX - max. Anzahl Eintrage in Liste fuer Auto-Eingabe
-// DATENT_SEARCH - max. Anzahl Zellen, die durchsucht werden - neu: nur Strings zaehlen
-#define DATENT_MAX 200
-#define DATENT_SEARCH 2000
+// DATENT_MAX - max. Anzahl Eintrage in Liste fuer Auto-Eingabe
+// DATENT_SEARCH - max. Anzahl Zellen, die durchsucht werden - neu: nur Strings zaehlen
+#define DATENT_MAX 200
+#define DATENT_SEARCH 2000
bool ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, bool bLimit)
@@ -1586,23 +1586,23 @@ bool ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, b
String aString;
USHORT nCells = 0;
- // Die Beschraenkung auf angrenzende Zellen (ohne Luecken) ist nicht mehr gewollt
- // (Featurekommission zur 5.1), stattdessen abwechselnd nach oben und unten suchen,
- // damit naheliegende Zellen wenigstens zuerst gefunden werden.
- //! Abstaende der Zeilennummern vergleichen? (Performance??)
+ // Die Beschraenkung auf angrenzende Zellen (ohne Luecken) ist nicht mehr gewollt
+ // (Featurekommission zur 5.1), stattdessen abwechselnd nach oben und unten suchen,
+ // damit naheliegende Zellen wenigstens zuerst gefunden werden.
+ //! Abstaende der Zeilennummern vergleichen? (Performance??)
- SCSIZE nUpIndex = nThisIndex; // zeigt hinter die Zelle
- SCSIZE nDownIndex = nThisIndex; // zeigt auf die Zelle
+ SCSIZE nUpIndex = nThisIndex; // zeigt hinter die Zelle
+ SCSIZE nDownIndex = nThisIndex; // zeigt auf die Zelle
if (bThisUsed)
- ++nDownIndex; // Startzelle ueberspringen
+ ++nDownIndex; // Startzelle ueberspringen
while ( nUpIndex || nDownIndex < nCount )
{
- if ( nUpIndex ) // nach oben
+ if ( nUpIndex ) // nach oben
{
ScBaseCell* pCell = pItems[nUpIndex-1].pCell;
CellType eType = pCell->GetCellType();
- if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren
+ if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren
{
if (eType == CELLTYPE_STRING)
((ScStringCell*)pCell)->GetString(aString);
@@ -1611,23 +1611,23 @@ bool ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, b
TypedStrData* pData = new TypedStrData(aString);
if ( !rStrings.Insert( pData ) )
- delete pData; // doppelt
+ delete pData; // doppelt
else if ( bLimit && rStrings.GetCount() >= DATENT_MAX )
- break; // Maximum erreicht
+ break; // Maximum erreicht
bFound = TRUE;
if ( bLimit )
if (++nCells >= DATENT_SEARCH)
- break; // genug gesucht
+ break; // genug gesucht
}
--nUpIndex;
}
- if ( nDownIndex < nCount ) // nach unten
+ if ( nDownIndex < nCount ) // nach unten
{
ScBaseCell* pCell = pItems[nDownIndex].pCell;
CellType eType = pCell->GetCellType();
- if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren
+ if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren
{
if (eType == CELLTYPE_STRING)
((ScStringCell*)pCell)->GetString(aString);
@@ -1636,14 +1636,14 @@ bool ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, b
TypedStrData* pData = new TypedStrData(aString);
if ( !rStrings.Insert( pData ) )
- delete pData; // doppelt
+ delete pData; // doppelt
else if ( bLimit && rStrings.GetCount() >= DATENT_MAX )
- break; // Maximum erreicht
+ break; // Maximum erreicht
bFound = TRUE;
if ( bLimit )
if (++nCells >= DATENT_SEARCH)
- break; // genug gesucht
+ break; // genug gesucht
}
++nDownIndex;
}
@@ -1722,7 +1722,7 @@ void ScColumn::SetValue( SCROW nRow, const double& rVal)
void ScColumn::GetString( SCROW nRow, String& rString ) const
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
Color* pColor;
if (Search(nRow, nIndex))
{
@@ -1742,7 +1742,7 @@ void ScColumn::GetString( SCROW nRow, String& rString ) const
void ScColumn::GetInputString( SCROW nRow, String& rString ) const
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
{
ScBaseCell* pCell = pItems[nIndex].pCell;
@@ -1761,7 +1761,7 @@ void ScColumn::GetInputString( SCROW nRow, String& rString ) const
double ScColumn::GetValue( SCROW nRow ) const
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
{
ScBaseCell* pCell = pItems[nIndex].pCell;
@@ -1789,7 +1789,7 @@ double ScColumn::GetValue( SCROW nRow ) const
void ScColumn::GetFormula( SCROW nRow, String& rFormula ) const
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
{
ScBaseCell* pCell = pItems[nIndex].pCell;
@@ -1805,7 +1805,7 @@ void ScColumn::GetFormula( SCROW nRow, String& rFormula ) const
CellType ScColumn::GetCellType( SCROW nRow ) const
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
return pItems[nIndex].pCell->GetCellType();
return CELLTYPE_NONE;
@@ -1814,7 +1814,7 @@ CellType ScColumn::GetCellType( SCROW nRow ) const
USHORT ScColumn::GetErrCode( SCROW nRow ) const
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
{
ScBaseCell* pCell = pItems[nIndex].pCell;
@@ -1827,7 +1827,7 @@ USHORT ScColumn::GetErrCode( SCROW nRow ) const
bool ScColumn::HasStringData( SCROW nRow ) const
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
return (pItems[nIndex].pCell)->HasStringData();
return FALSE;
@@ -1836,7 +1836,7 @@ bool ScColumn::HasStringData( SCROW nRow ) const
bool ScColumn::HasValueData( SCROW nRow ) const
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
return (pItems[nIndex].pCell)->HasValueData();
return FALSE;
@@ -1844,7 +1844,7 @@ bool ScColumn::HasValueData( SCROW nRow ) const
bool ScColumn::HasStringCells( SCROW nStartRow, SCROW nEndRow ) const
{
- // TRUE, wenn String- oder Editzellen im Bereich
+ // TRUE, wenn String- oder Editzellen im Bereich
if ( pItems )
{
commit 306505e176c30b4fd4f0f8a9a0075034e599c45e
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Jan 3 23:08:33 2011 -0500
Fixed build errors due to BOOL to bool conversions.
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 0bc7bb4..9fddb90 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -252,8 +252,7 @@ public:
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;
+ void GetFormula( SCROW nRow, String& rFormula ) const;
CellType GetCellType( SCROW nRow ) const;
SCSIZE GetCellCount() const { return nCount; }
sal_uIntPtr GetWeightedCount() const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3401e54..a3b1fd9 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -778,8 +778,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;
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/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 717883a..0fd7616 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -667,7 +667,7 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r
// nRow1, nRow2 = Zielposition
void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
- USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty,
+ USHORT nInsFlag, bool bAsLink, bool bSkipAttrForEmpty,
ScColumn& rColumn)
{
if ((nInsFlag & IDF_ATTRIB) != 0)
@@ -941,7 +941,7 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestD
void ScColumn::MixMarked( const ScMarkData& rMark, USHORT nFunction,
- BOOL bSkipEmpty, ScColumn& rSrcCol )
+ bool bSkipEmpty, ScColumn& rSrcCol )
{
SCROW nRow1, nRow2;
@@ -999,7 +999,7 @@ void lcl_AddCode( ScTokenArray& rArr, ScFormulaCell* pCell )
void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
- USHORT nFunction, BOOL bSkipEmpty,
+ USHORT nFunction, bool bSkipEmpty,
ScColumn& rSrcCol )
{
SCSIZE nSrcCount = rSrcCol.nCount;
@@ -1262,7 +1262,7 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 )
// TRUE = Zahlformat gesetzt
-BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
formula::FormulaGrammar::AddressConvention eConv,
ScSetStringParam* pParam )
{
@@ -1578,7 +1578,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
#define DATENT_SEARCH 2000
-BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, BOOL bLimit)
+bool ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, bool bLimit)
{
BOOL bFound = FALSE;
SCSIZE nThisIndex;
@@ -1787,7 +1787,7 @@ double ScColumn::GetValue( SCROW nRow ) const
}
-void ScColumn::GetFormula( SCROW nRow, String& rFormula, BOOL ) const
+void ScColumn::GetFormula( SCROW nRow, String& rFormula ) const
{
SCSIZE nIndex;
if (Search(nRow, nIndex))
@@ -1825,7 +1825,7 @@ USHORT ScColumn::GetErrCode( SCROW nRow ) const
}
-BOOL ScColumn::HasStringData( SCROW nRow ) const
+bool ScColumn::HasStringData( SCROW nRow ) const
{
SCSIZE nIndex;
if (Search(nRow, nIndex))
@@ -1834,7 +1834,7 @@ BOOL ScColumn::HasStringData( SCROW nRow ) const
}
-BOOL ScColumn::HasValueData( SCROW nRow ) const
+bool ScColumn::HasValueData( SCROW nRow ) const
{
SCSIZE nIndex;
if (Search(nRow, nIndex))
@@ -1842,7 +1842,7 @@ BOOL ScColumn::HasValueData( SCROW nRow ) const
return FALSE;
}
-BOOL ScColumn::HasStringCells( SCROW nStartRow, SCROW nEndRow ) const
+bool ScColumn::HasStringCells( SCROW nStartRow, SCROW nEndRow ) const
{
// TRUE, wenn String- oder Editzellen im Bereich
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index d5f37a1..cce8b76 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2862,11 +2862,10 @@ void ScDocument::GetNumberFormatInfo( short& nType, ULONG& nIndex,
}
-void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula,
- BOOL bAsciiExport ) const
+void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula ) const
{
if ( VALIDTAB(nTab) && pTab[nTab] )
- pTab[nTab]->GetFormula( nCol, nRow, rFormula, bAsciiExport );
+ pTab[nTab]->GetFormula( nCol, nRow, rFormula );
else
rFormula.Erase();
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 3947753..56325ed 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1045,11 +1045,10 @@ double ScTable::GetValue( SCCOL nCol, SCROW nRow )
}
-void ScTable::GetFormula( SCCOL nCol, SCROW nRow, String& rFormula,
- BOOL bAsciiExport )
+void ScTable::GetFormula( SCCOL nCol, SCROW nRow, String& rFormula )
{
if (ValidColRow(nCol,nRow))
- aCol[nCol].GetFormula( nRow, rFormula, bAsciiExport );
+ aCol[nCol].GetFormula( nRow, rFormula );
else
rFormula.Erase();
}
@@ -1920,7 +1919,7 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r
rFound = FALSE;
BOOL bEqual = TRUE;
- BOOL bColFound;
+ bool bColFound;
const ScStyleSheet* pStyle = NULL;
const ScStyleSheet* pNewStyle;
@@ -1948,7 +1947,7 @@ const ScStyleSheet* ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow
rFound = FALSE;
BOOL bEqual = TRUE;
- BOOL bColFound;
+ bool bColFound;
const ScStyleSheet* pStyle = NULL;
const ScStyleSheet* pNewStyle;
@@ -2922,7 +2921,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
// Zeilen
SCROW nCount = nEndRow-nStartRow+1;
- BOOL* pUsed = new BOOL[nCount];
+ bool* pUsed = new bool[nCount];
for (i=0; i<nCount; i++)
pUsed[i] = FALSE;
for (nCol=nStartCol; nCol<=nEndCol; nCol++)
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 2ad1225..23b7238 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1456,7 +1456,7 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm )
{
if (bFormulas)
{
- pDoc->GetFormula( nCol, nRow, aRange.aStart.Tab(), aCell, TRUE );
+ pDoc->GetFormula( nCol, nRow, aRange.aStart.Tab(), aCell );
if( aCell.Search( cSep ) != STRING_NOTFOUND )
lcl_WriteString( rStrm, aCell, cStr, cStr );
else
commit 60ddf4dbc323702bd8f048684baca2737d39f4d9
Author: Sören Möller <soerenmoeller2001 at gmail.com>
Date: Mon Jan 3 21:30:29 2011 +0100
Removed dependencies on tools/solar.h
Replaced all uses of (deprecated) data types from tools/solar.h by
the corresponding data types in sal/types.h or the standard bool
type.
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index cf193de..0bc7bb4 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>
@@ -77,18 +76,18 @@ struct ScColWidthParam;
struct ScNeededSizeOptions
{
const ScPatternAttr* pPattern;
- BOOL bFormula;
- BOOL bSkipMerged;
- BOOL bGetFont;
- BOOL bTotalSize;
+ 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;
}
};
@@ -140,10 +139,10 @@ public:
void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc);
- BOOL Search( SCROW nRow, SCSIZE& nIndex ) const;
+ 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 Insert( SCROW nRow, sal_uIntPtr nFormatIndex, ScBaseCell* pCell );
void Append( SCROW nRow, ScBaseCell* pCell );
void Delete( SCROW nRow );
void DeleteAtIndex( SCSIZE nIndex );
@@ -152,65 +151,65 @@ public:
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,
+ 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; // ohne Broadcaster
- BOOL IsEmptyData() const;
- BOOL IsEmptyAttr() const;
- BOOL IsEmpty() const;
+ bool IsEmptyVisData(bool bNotes) const; // ohne Broadcaster
+ bool IsEmptyData() const;
+ bool IsEmptyAttr() const;
+ bool IsEmpty() const;
// nur Daten:
- BOOL IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const;
+ 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;
+ bool HasDataAt(SCROW nRow) const;
+ bool HasVisibleDataAt(SCROW nRow) const;
SCROW GetFirstDataPos() const;
SCROW GetLastDataPos() const;
- SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne Broadcaster
- SCROW GetFirstVisDataPos(BOOL bNotes) const;
- BOOL GetPrevDataPos(SCROW& rRow) const;
- BOOL GetNextDataPos(SCROW& rRow) const;
+ SCROW GetLastVisDataPos(bool bNotes) const; // ohne Broadcaster
+ SCROW GetFirstVisDataPos(bool bNotes) const;
+ bool GetPrevDataPos(SCROW& rRow) const;
+ bool GetNextDataPos(SCROW& rRow) const;
void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne Broadcaster)
- void FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const;
+ 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;
+ 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,
+ 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 IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const;
- BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
- BOOL TestInsertRow( SCSIZE nSize ) 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 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,
- USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScColumn& rColumn);
+ 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 );
// Markierung von diesem Dokument
- void MixMarked( const ScMarkData& rMark, USHORT nFunction,
- BOOL bSkipEmpty, ScColumn& rSrcCol );
- void MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty,
+ 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;
+ SCSIZE nIndex, sal_uInt16 nFlags ) const;
ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const;
@@ -220,20 +219,20 @@ public:
void UpdateSelectionFunction( const ScMarkData& rMark,
ScFunctionData& rData,
ScFlatBoolRowSegments& rHiddenRows,
- BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
+ 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;
+ bool TestCopyScenarioTo( const ScColumn& rDestCol ) const;
void MarkScenarioIn( ScMarkData& rDestMark ) const;
void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const;
@@ -241,29 +240,29 @@ public:
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 = Zahlformat gesetzt
- BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString,
+ // true = Zahlformat gesetzt
+ 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 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,
- BOOL bAsciiExport = FALSE ) const;
+ bool bAsciiExport = false ) const;
CellType GetCellType( SCROW nRow ) const;
SCSIZE GetCellCount() const { return nCount; }
- ULONG GetWeightedCount() const;
- ULONG GetCodeCount() const; // RPN-Code in Formeln
- USHORT GetErrCode( SCROW nRow ) const;
+ sal_uIntPtr GetWeightedCount() const;
+ sal_uIntPtr GetCodeCount() const; // RPN-Code in Formeln
+ sal_uInt16 GetErrCode( SCROW nRow ) const;
- BOOL HasStringData( SCROW nRow ) const;
- BOOL HasValueData( SCROW nRow ) const;
- BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) 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 );
@@ -292,41 +291,41 @@ public:
ScDocument* pUndoDoc = NULL );
void UpdateInsertTab( SCTAB nTable);
void UpdateInsertTabOnlyCells( SCTAB nTable);
- void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL );
+ void UpdateDeleteTab( SCTAB nTable, bool bIsMove, ScColumn* pRefUndo = NULL );
void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
- void UpdateCompile( BOOL bForceIfNameInUse = FALSE );
+ 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 SetTabNo(SCTAB nNewTab);
- BOOL IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const;
- void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const;
+ 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 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_uIntPtr 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 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;
+ 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 );
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 SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, bool bPutToPool = false );
void SetPatternArea( SCROW nStartRow, SCROW nEndRow,
- const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE );
+ const ScPatternAttr& rPatAttr, bool bPutToPool = false );
void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
const ScPatternAttr& rPattern, short nNewType );
@@ -334,61 +333,61 @@ public:
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 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* 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;
+ 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 );
+ 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 );
SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
- void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
+ 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,
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 );
+ 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);
+ 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;
+ bool TestTabRefAbs(SCTAB nTable);
+ bool GetNextSpellingCell(SCROW& nRow, bool bInSel, const ScMarkData& rData) const;
void RemoveAutoSpellObj();
@@ -396,12 +395,12 @@ public:
void EndListening( SvtListener& rLst, SCROW nRow );
void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow );
void StartAllListeners();
- void StartNeededListeners(); // only for cells where NeedsListening()==TRUE
+ void StartNeededListeners(); // only for cells where NeedsListening()==true
void SetRelNameDirty();
void CompileDBFormula();
- void CompileDBFormula( BOOL bCreateFormulaString );
- void CompileNameFormula( BOOL bCreateFormulaString );
+ void CompileDBFormula( bool bCreateFormulaString );
+ void CompileNameFormula( bool bCreateFormulaString );
void CompileColRowNameFormula();
sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const;
@@ -409,7 +408,7 @@ public:
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);
};
@@ -423,7 +422,7 @@ public:
ScColumnIterator( const ScColumn* pCol, SCROW nStart=0, SCROW nEnd=MAXROW );
~ScColumnIterator();
- BOOL Next( SCROW& rRow, ScBaseCell*& rpCell );
+ bool Next( SCROW& rRow, ScBaseCell*& rpCell );
SCSIZE GetIndex() const;
};
@@ -435,15 +434,15 @@ class ScMarkedDataIter // Daten in selektierten Bereichen durchgehen
ScMarkArrayIter* pMarkIter;
SCROW nTop;
SCROW nBottom;
- BOOL bNext;
- BOOL bAll;
+ 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/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 0ae30f5..042e849 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -59,7 +59,7 @@
// STATIC DATA -----------------------------------------------------------
using namespace formula;
-inline BOOL IsAmbiguousScriptNonZero( BYTE nScript )
+inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
{
//! move to a header file
return ( nScript != SCRIPTTYPE_LATIN &&
@@ -110,13 +110,13 @@ void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc)
}
-SCsROW ScColumn::GetNextUnprotected( SCROW nRow, BOOL bUp ) const
+SCsROW ScColumn::GetNextUnprotected( SCROW nRow, bool bUp ) const
{
return pAttrArray->GetNextUnprotected(nRow, bUp);
}
-USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const
+sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
{
// nix:0, mitte:1, unten:2, links:4, oben:8, rechts:16, offen:32
if ( !pItems )
@@ -139,8 +139,8 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
else
{
ScAddress aOrg( ScAddress::INITIALIZE_INVALID );
- BOOL bOpen = FALSE;
- USHORT nEdges = 0;
+ bool bOpen = false;
+ sal_uInt16 nEdges = 0;
SCSIZE nIndex;
Search( nRow1, nIndex );
while ( nIndex < nCount && pItems[nIndex].nRow <= nRow2 )
@@ -153,7 +153,7 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
if ( nEdges )
{
if ( nEdges & 8 )
- bOpen = TRUE; // obere Kante oeffnet, weitersehen
+ bOpen = true; // obere Kante oeffnet, weitersehen
else if ( !bOpen )
return nEdges | 32; // es gibt was, was nicht geoeffnet wurde
else if ( nEdges & 1 )
@@ -164,7 +164,7 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
|| ((nMask & 4) && (nEdges & 16) && !(nEdges & 4)) )
return nEdges; // nur linke/rechte Kante
if ( nEdges & 2 )
- bOpen = FALSE; // untere Kante schliesst
+ bOpen = false; // untere Kante schliesst
}
}
nIndex++;
@@ -176,11 +176,11 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
}
-BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
+bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
{
if ( rMark.IsMultiMarked() )
{
- BOOL bFound = FALSE;
+ bool bFound = false;
ScAddress aOrg( ScAddress::INITIALIZE_INVALID );
ScAddress aCurOrg( ScAddress::INITIALIZE_INVALID );
@@ -188,8 +188,8 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
ScMarkArrayIter aMarkIter( rMark.GetArray()+nCol );
while ( !bFound && aMarkIter.Next( nTop, nBottom ) )
{
- BOOL bOpen = FALSE;
- USHORT nEdges;
+ bool bOpen = false;
+ sal_uInt16 nEdges;
SCSIZE nIndex;
Search( nTop, nIndex );
while ( !bFound && nIndex < nCount && pItems[nIndex].nRow <= nBottom )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list