summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-03-13 11:41:20 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-03-14 00:35:28 -0400
commitc18dc2e2047f07fb13ec5890db4dbd4357cfa7ce (patch)
treead0e2e321b996a7ea4b49be1d7a7315abcf76c5c
parent599c06acb2d8bfc986eaac061aa4b7e2a5bab3c6 (diff)
Use bool.
-rw-r--r--sc/source/ui/docshell/dbdocfun.cxx18
-rw-r--r--sc/source/ui/inc/dbdocfun.hxx4
2 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 3266abe03be0..145f457691ba 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1192,14 +1192,14 @@ sal_Bool lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange
return sal_True; // nothing found - empty
}
-sal_Bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
- sal_Bool bRecord, sal_Bool bApi, sal_Bool bAllowMove )
+bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
+ bool bRecord, bool bApi, bool bAllowMove )
{
ScDocShellModificator aModificator( rDocShell );
WaitObject aWait( rDocShell.GetActiveDialogParent() );
- sal_Bool bDone = false;
- sal_Bool bUndoSelf = false;
+ bool bDone = false;
+ bool bUndoSelf = false;
sal_uInt16 nErrId = 0;
ScDocument* pOldUndoDoc = NULL;
@@ -1265,7 +1265,7 @@ sal_Bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pN
rDocShell.PostPaintGridAll(); //! only necessary parts
rDocShell.PostPaint(aRange, PAINT_GRID);
- bDone = sal_True;
+ bDone = true;
}
else if ( pNewObj )
{
@@ -1352,7 +1352,7 @@ sal_Bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pN
{
// like with STR_PROTECTIONERR, use undo to reverse everything
OSL_ENSURE( bRecord, "DataPilotUpdate: can't undo" );
- bUndoSelf = sal_True;
+ bUndoSelf = true;
nErrId = STR_PIVOT_ERROR;
}
else
@@ -1374,7 +1374,7 @@ sal_Bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pN
// test if new output area is empty except for old area
if ( !bApi )
{
- sal_Bool bEmpty;
+ bool bEmpty;
if ( pOldObj ) // OutRange of pOldObj (pDestObj) is still old area
bEmpty = lcl_EmptyExcept( pDoc, aNewOut, pOldObj->GetOutRange() );
else
@@ -1390,7 +1390,7 @@ sal_Bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pN
{
//! like above (not editable), use undo to reverse everything
OSL_ENSURE( bRecord, "DataPilotUpdate: can't undo" );
- bUndoSelf = sal_True;
+ bUndoSelf = true;
}
}
}
@@ -1406,7 +1406,7 @@ sal_Bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pN
pDestObj->Output( aNewOut.aStart );
rDocShell.PostPaintGridAll(); //! only necessary parts
- bDone = sal_True;
+ bDone = true;
}
}
// else nothing (no old, no new)
diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx
index 83996ccb3517..35ad8489c6e1 100644
--- a/sc/source/ui/inc/dbdocfun.hxx
+++ b/sc/source/ui/inc/dbdocfun.hxx
@@ -98,8 +98,8 @@ public:
bool RepeatDB( const ::rtl::OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed=false, SCTAB aTab = 0);
- sal_Bool DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
- sal_Bool bRecord, sal_Bool bApi, sal_Bool bAllowMove = false );
+ bool DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
+ bool bRecord, bool bApi, bool bAllowMove = false );
};