summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-19 10:24:21 +0200
committerNoel Grandin <noel@peralex.com>2014-02-19 13:05:10 +0200
commit47f3b228545d80b3669e4bee4b81f2276e6ac7ab (patch)
treecd63632f47f60aedca43eaac2cc898f7ea0b0562 /sc/source/ui
parent11189797891d2b7508c37bcea83bce1b2302b92f (diff)
sal_Bool->bool
Change-Id: I6c926b0b4dabd8c1dc0927f46ff76ff53d55920f
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/docshell/docfunc.cxx2
-rw-r--r--sc/source/ui/inc/undocell.hxx36
-rw-r--r--sc/source/ui/undo/undocell.cxx22
3 files changed, 30 insertions, 30 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index c5daaeedd114..72ae27cc7e49 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3581,7 +3581,7 @@ bool ScDocFunc::InsertPageBreak( bool bColumn, const ScAddress& rPos,
if (bRecord)
rDocShell.GetUndoManager()->AddUndoAction(
- new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, sal_True ) );
+ new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, true ) );
if (bColumn)
pDoc->SetColBreak(static_cast<SCCOL>(nPos), nTab, false, true);
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 0b039b778726..3562983edf62 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -50,7 +50,7 @@ public:
ScUndoCursorAttr( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
- const ScPatternAttr* pApplyPat, sal_Bool bAutomatic );
+ const ScPatternAttr* pApplyPat, bool bAutomatic );
virtual ~ScUndoCursorAttr();
virtual void Undo();
@@ -74,7 +74,7 @@ private:
ScPatternAttr* pApplyPattern;
::boost::shared_ptr<EditTextObject> pOldEditData;
::boost::shared_ptr<EditTextObject> pNewEditData;
- sal_Bool bIsAutomatic;
+ bool bIsAutomatic;
void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const;
};
@@ -113,7 +113,7 @@ public:
private:
ValuesType maOldValues;
- OUString maNewString;
+ OUString maNewString;
boost::scoped_ptr<EditTextObject> mpNewEditData;
sal_uLong mnEndChangeAction;
ScAddress maPos;
@@ -144,7 +144,7 @@ private:
ScAddress aPos;
ScCellValue maOldCell;
double nValue;
- sal_uLong nEndChangeAction;
+ sal_uLong nEndChangeAction;
void SetChangeTrack();
};
@@ -180,7 +180,7 @@ public:
TYPEINFO();
ScUndoPageBreak( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
- sal_Bool bNewColumn, sal_Bool bNewInsert );
+ bool bNewColumn, bool bNewInsert );
virtual ~ScUndoPageBreak();
virtual void Undo();
@@ -194,10 +194,10 @@ private:
SCCOL nCol;
SCROW nRow;
SCTAB nTab;
- sal_Bool bColumn; // Column or row break
- sal_Bool bInsert; // Insert or Delete
+ bool bColumn; // Column or row break
+ bool bInsert; // Insert or Delete
- void DoChange( sal_Bool bInsert ) const;
+ void DoChange( bool bInsert ) const;
};
class ScUndoPrintZoom: public ScSimpleUndo
@@ -217,12 +217,12 @@ public:
private:
SCTAB nTab;
- sal_uInt16 nOldScale;
- sal_uInt16 nOldPages;
- sal_uInt16 nNewScale;
- sal_uInt16 nNewPages;
+ sal_uInt16 nOldScale;
+ sal_uInt16 nOldPages;
+ sal_uInt16 nNewScale;
+ sal_uInt16 nNewPages;
- void DoChange( sal_Bool bUndo );
+ void DoChange( bool bUndo );
};
class ScUndoThesaurus: public ScSimpleUndo
@@ -250,9 +250,9 @@ private:
EditTextObject* pUndoTObject; // at Edit cell
OUString aRedoStr;
EditTextObject* pRedoTObject;
- sal_uLong nEndChangeAction;
+ sal_uLong nEndChangeAction;
- void DoChange( sal_Bool bUndo, const OUString& rStr,
+ void DoChange( bool bUndo, const OUString& rStr,
const EditTextObject* pTObj );
void SetChangeTrack( const ScCellValue& rOldCell );
};
@@ -342,9 +342,9 @@ public:
virtual OUString GetComment() const;
private:
- sal_Bool bIsDelete;
+ bool bIsDelete;
ScDetOpList* pOldList;
- sal_uInt16 nAction;
+ sal_uInt16 nAction;
ScAddress aPos;
SdrUndoAction* pDrawUndo;
};
@@ -371,7 +371,7 @@ private:
ScRangeName* pNewRanges;
SCTAB mnTab;
- void DoChange( sal_Bool bUndo );
+ void DoChange( bool bUndo );
};
namespace sc {
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 80365153bef3..a21150066d61 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -81,7 +81,7 @@ TYPEINIT1(ScUndoRangeNames, ScSimpleUndo);
ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
- const ScPatternAttr* pApplyPat, sal_Bool bAutomatic ) :
+ const ScPatternAttr* pApplyPat, bool bAutomatic ) :
ScSimpleUndo( pNewDocShell ),
nCol( nNewCol ),
nRow( nNewRow ),
@@ -136,9 +136,9 @@ void ScUndoCursorAttr::DoChange( const ScPatternAttr* pWhichPattern, const share
}
const SfxItemSet& rApplySet = pApplyPattern->GetItemSet();
- sal_Bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, sal_True ) != SFX_ITEM_DEFAULT ||
+ bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, sal_True ) != SFX_ITEM_DEFAULT ||
rApplySet.GetItemState( ATTR_CONDITIONAL, sal_True ) != SFX_ITEM_DEFAULT );
- sal_Bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, sal_True ) != SFX_ITEM_DEFAULT );
+ bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, sal_True ) != SFX_ITEM_DEFAULT );
sal_uInt16 nFlags = SC_PF_TESTMERGE;
if (bPaintExt)
@@ -498,7 +498,7 @@ void ScUndoSetCell::SetValue( const ScCellValue& rVal )
ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
- sal_Bool bNewColumn, sal_Bool bNewInsert ) :
+ bool bNewColumn, bool bNewInsert ) :
ScSimpleUndo( pNewDocShell ),
nCol( nNewCol ),
nRow( nNewRow ),
@@ -526,7 +526,7 @@ OUString ScUndoPageBreak::GetComment() const
) );
}
-void ScUndoPageBreak::DoChange( sal_Bool bInsertP ) const
+void ScUndoPageBreak::DoChange( bool bInsertP ) const
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -596,7 +596,7 @@ OUString ScUndoPrintZoom::GetComment() const
return ScGlobal::GetRscString( STR_UNDO_PRINTSCALE );
}
-void ScUndoPrintZoom::DoChange( sal_Bool bUndo )
+void ScUndoPrintZoom::DoChange( bool bUndo )
{
sal_uInt16 nScale = bUndo ? nOldScale : nNewScale;
sal_uInt16 nPages = bUndo ? nOldPages : nNewPages;
@@ -620,7 +620,7 @@ void ScUndoPrintZoom::DoChange( sal_Bool bUndo )
void ScUndoPrintZoom::Undo()
{
BeginUndo();
- DoChange(sal_True);
+ DoChange(true);
EndUndo();
}
@@ -699,7 +699,7 @@ void ScUndoThesaurus::SetChangeTrack( const ScCellValue& rOldCell )
nEndChangeAction = 0;
}
-void ScUndoThesaurus::DoChange( sal_Bool bUndo, const OUString& rStr,
+void ScUndoThesaurus::DoChange( bool bUndo, const OUString& rStr,
const EditTextObject* pTObj )
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -752,7 +752,7 @@ void ScUndoThesaurus::DoChange( sal_Bool bUndo, const OUString& rStr,
void ScUndoThesaurus::Undo()
{
BeginUndo();
- DoChange( sal_True, aUndoStr, pUndoTObject );
+ DoChange( true, aUndoStr, pUndoTObject );
ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
if ( pChangeTrack )
pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
@@ -1039,7 +1039,7 @@ OUString ScUndoRangeNames::GetComment() const
return ScGlobal::GetRscString( STR_UNDO_RANGENAMES );
}
-void ScUndoRangeNames::DoChange( sal_Bool bUndo )
+void ScUndoRangeNames::DoChange( bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
pDoc->CompileNameFormula( true ); // CreateFormulaString
@@ -1067,7 +1067,7 @@ void ScUndoRangeNames::DoChange( sal_Bool bUndo )
void ScUndoRangeNames::Undo()
{
BeginUndo();
- DoChange( sal_True );
+ DoChange( true );
EndUndo();
}