Skip to content

C
core
Kaydet (Commit) ec3c9a5f authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

sal_Bool->bool 

Change-Id: I1b45ccb419ce827ca9ddb475e67878c95d67d36d
üst a572badf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
sc/inc/detfunc.hxx
Dosyayı görüntüle @ ec3c9a5f
...@@ -53,7 +53,7 @@ class SC_DLLPUBLIC ScDetectiveFunc ...@@ -53,7 +53,7 @@ class SC_DLLPUBLIC ScDetectiveFunc
static ColorData nArrowColor; static ColorData nArrowColor;
static ColorData nErrorColor; static ColorData nErrorColor;
static ColorData nCommentColor; static ColorData nCommentColor;
static sal_Bool bColorsInitialized; static bool bColorsInitialized;
ScDocument* pDoc; ScDocument* pDoc;
SCTAB nTab; SCTAB nTab;
...@@ -76,30 +76,30 @@ class SC_DLLPUBLIC ScDetectiveFunc ...@@ -76,30 +76,30 @@ class SC_DLLPUBLIC ScDetectiveFunc
/** @return the drawing layer rectangle for the passed cell address. */ /** @return the drawing layer rectangle for the passed cell address. */
Rectangle GetDrawRect( SCCOL nCol, SCROW nRow ) const; Rectangle GetDrawRect( SCCOL nCol, SCROW nRow ) const;
sal_Bool HasArrow( const ScAddress& rStart, bool HasArrow( const ScAddress& rStart,
SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab ); SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
void DeleteArrowsAt( SCCOL nCol, SCROW nRow, sal_Bool bDestPnt ); void DeleteArrowsAt( SCCOL nCol, SCROW nRow, bool bDestPnt );
void DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
sal_Bool HasError( const ScRange& rRange, ScAddress& rErrPos ); bool HasError( const ScRange& rRange, ScAddress& rErrPos );
void FillAttributes( ScDetectiveData& rData ); void FillAttributes( ScDetectiveData& rData );
/// called from DrawEntry/DrawAlienEntry and InsertObject /// called from DrawEntry/DrawAlienEntry and InsertObject
sal_Bool InsertArrow( SCCOL nCol, SCROW nRow, bool InsertArrow( SCCOL nCol, SCROW nRow,
SCCOL nRefStartCol, SCROW nRefStartRow, SCCOL nRefStartCol, SCROW nRefStartRow,
SCCOL nRefEndCol, SCROW nRefEndRow, SCCOL nRefEndCol, SCROW nRefEndRow,
sal_Bool bFromOtherTab, sal_Bool bRed, bool bFromOtherTab, bool bRed,
ScDetectiveData& rData ); ScDetectiveData& rData );
sal_Bool InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, bool InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow, sal_Bool bRed, SCCOL nEndCol, SCROW nEndRow, bool bRed,
ScDetectiveData& rData ); ScDetectiveData& rData );
/// DrawEntry / DrawAlienEntry check for existing arrows and errors /// DrawEntry / DrawAlienEntry check for existing arrows and errors
sal_Bool DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef, bool DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef,
ScDetectiveData& rData ); ScDetectiveData& rData );
sal_Bool DrawAlienEntry( const ScRange& rRef, bool DrawAlienEntry( const ScRange& rRef,
ScDetectiveData& rData ); ScDetectiveData& rData );
void DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData ); void DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData );
...@@ -118,22 +118,22 @@ class SC_DLLPUBLIC ScDetectiveFunc ...@@ -118,22 +118,22 @@ class SC_DLLPUBLIC ScDetectiveFunc
sal_uInt16 FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uInt16 nLevel, sal_uInt16 nDeleteLevel ); sal_uInt16 nLevel, sal_uInt16 nDeleteLevel );
sal_Bool FindFrameForObject( SdrObject* pObject, ScRange& rRange ); bool FindFrameForObject( SdrObject* pObject, ScRange& rRange );
void Modified(); void Modified();
public: public:
ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : pDoc(pDocument),nTab(nTable) {} ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : pDoc(pDocument),nTab(nTable) {}
sal_Bool ShowSucc( SCCOL nCol, SCROW nRow ); bool ShowSucc( SCCOL nCol, SCROW nRow );
sal_Bool ShowPred( SCCOL nCol, SCROW nRow ); bool ShowPred( SCCOL nCol, SCROW nRow );
sal_Bool ShowError( SCCOL nCol, SCROW nRow ); bool ShowError( SCCOL nCol, SCROW nRow );
sal_Bool DeleteSucc( SCCOL nCol, SCROW nRow ); bool DeleteSucc( SCCOL nCol, SCROW nRow );
sal_Bool DeletePred( SCCOL nCol, SCROW nRow ); bool DeletePred( SCCOL nCol, SCROW nRow );
sal_Bool DeleteAll( ScDetectiveDelete eWhat ); bool DeleteAll( ScDetectiveDelete eWhat );
sal_Bool MarkInvalid(sal_Bool& rOverflow); bool MarkInvalid(bool& rOverflow);
void GetAllPreds(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScTokenRef>& rRefTokens); void GetAllPreds(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScTokenRef>& rRefTokens);
void GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScTokenRef>& rRefTokens); void GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScTokenRef>& rRefTokens);
...@@ -141,18 +141,18 @@ public: ...@@ -141,18 +141,18 @@ public:
static void UpdateAllComments( ScDocument& rDoc ); ///< on all tables static void UpdateAllComments( ScDocument& rDoc ); ///< on all tables
void UpdateAllArrowColors(); ///< on all tables void UpdateAllArrowColors(); ///< on all tables
static sal_Bool IsNonAlienArrow( SdrObject* pObject ); static bool IsNonAlienArrow( SdrObject* pObject );
ScDetectiveObjType GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab, ScDetectiveObjType GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab,
ScAddress& rPosition, ScRange& rSource, bool& rRedLine ); ScAddress& rPosition, ScRange& rSource, bool& rRedLine );
void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition, void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition,
const ScRange& rSource, sal_Bool bRedLine ); const ScRange& rSource, bool bRedLine );
static ColorData GetArrowColor(); static ColorData GetArrowColor();
static ColorData GetErrorColor(); static ColorData GetErrorColor();
static ColorData GetCommentColor(); static ColorData GetCommentColor();
static void InitializeColors(); static void InitializeColors();
static sal_Bool IsColorsInitialized(); static bool IsColorsInitialized();
static void AppendChangTrackNoteSeparator(OUString &str); static void AppendChangTrackNoteSeparator(OUString &str);
}; };
......
sc/source/core/tool/detfunc.cxx
Dosyayı görüntüle @ ec3c9a5f
This diff is collapsed.
sc/source/ui/docshell/docfunc.cxx
Dosyayı görüntüle @ ec3c9a5f
...@@ -184,7 +184,7 @@ sal_Bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos) ...@@ -184,7 +184,7 @@ sal_Bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos)
if (bUndo) if (bUndo)
pModel->BeginCalcUndo(false); pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowPred( nCol, nRow ); bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowPred( nCol, nRow );
SdrUndoGroup* pUndo = NULL; SdrUndoGroup* pUndo = NULL;
if (bUndo) if (bUndo)
pUndo = pModel->GetCalcUndo(); pUndo = pModel->GetCalcUndo();
...@@ -225,7 +225,7 @@ sal_Bool ScDocFunc::DetectiveDelPred(const ScAddress& rPos) ...@@ -225,7 +225,7 @@ sal_Bool ScDocFunc::DetectiveDelPred(const ScAddress& rPos)
if (bUndo) if (bUndo)
pModel->BeginCalcUndo(false); pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeletePred( nCol, nRow ); bool bDone = ScDetectiveFunc( pDoc,nTab ).DeletePred( nCol, nRow );
SdrUndoGroup* pUndo = NULL; SdrUndoGroup* pUndo = NULL;
if (bUndo) if (bUndo)
pUndo = pModel->GetCalcUndo(); pUndo = pModel->GetCalcUndo();
...@@ -264,7 +264,7 @@ sal_Bool ScDocFunc::DetectiveAddSucc(const ScAddress& rPos) ...@@ -264,7 +264,7 @@ sal_Bool ScDocFunc::DetectiveAddSucc(const ScAddress& rPos)
if (bUndo) if (bUndo)
pModel->BeginCalcUndo(false); pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowSucc( nCol, nRow ); bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowSucc( nCol, nRow );
SdrUndoGroup* pUndo = NULL; SdrUndoGroup* pUndo = NULL;
if (bUndo) if (bUndo)
pUndo = pModel->GetCalcUndo(); pUndo = pModel->GetCalcUndo();
...@@ -305,7 +305,7 @@ sal_Bool ScDocFunc::DetectiveDelSucc(const ScAddress& rPos) ...@@ -305,7 +305,7 @@ sal_Bool ScDocFunc::DetectiveDelSucc(const ScAddress& rPos)
if (bUndo) if (bUndo)
pModel->BeginCalcUndo(false); pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteSucc( nCol, nRow ); bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteSucc( nCol, nRow );
SdrUndoGroup* pUndo = NULL; SdrUndoGroup* pUndo = NULL;
if (bUndo) if (bUndo)
pUndo = pModel->GetCalcUndo(); pUndo = pModel->GetCalcUndo();
...@@ -344,7 +344,7 @@ sal_Bool ScDocFunc::DetectiveAddError(const ScAddress& rPos) ...@@ -344,7 +344,7 @@ sal_Bool ScDocFunc::DetectiveAddError(const ScAddress& rPos)
if (bUndo) if (bUndo)
pModel->BeginCalcUndo(false); pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowError( nCol, nRow ); bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowError( nCol, nRow );
SdrUndoGroup* pUndo = NULL; SdrUndoGroup* pUndo = NULL;
if (bUndo) if (bUndo)
pUndo = pModel->GetCalcUndo(); pUndo = pModel->GetCalcUndo();
...@@ -383,8 +383,8 @@ sal_Bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab) ...@@ -383,8 +383,8 @@ sal_Bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab)
pWaitWin->EnterWait(); pWaitWin->EnterWait();
if (bUndo) if (bUndo)
pModel->BeginCalcUndo(false); pModel->BeginCalcUndo(false);
sal_Bool bOverflow; bool bOverflow;
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).MarkInvalid( bOverflow ); bool bDone = ScDetectiveFunc( pDoc,nTab ).MarkInvalid( bOverflow );
SdrUndoGroup* pUndo = NULL; SdrUndoGroup* pUndo = NULL;
if (bUndo) if (bUndo)
pUndo = pModel->GetCalcUndo(); pUndo = pModel->GetCalcUndo();
...@@ -423,7 +423,7 @@ sal_Bool ScDocFunc::DetectiveDelAll(SCTAB nTab) ...@@ -423,7 +423,7 @@ sal_Bool ScDocFunc::DetectiveDelAll(SCTAB nTab)
if (bUndo) if (bUndo)
pModel->BeginCalcUndo(false); pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_DETECTIVE ); bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_DETECTIVE );
SdrUndoGroup* pUndo = NULL; SdrUndoGroup* pUndo = NULL;
if (bUndo) if (bUndo)
pUndo = pModel->GetCalcUndo(); pUndo = pModel->GetCalcUndo();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment