diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-14 15:21:03 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-18 10:07:54 +0200 |
commit | a21ecc1611dce99a70dc6e9ee219f743c75cadc5 (patch) | |
tree | bc4f72b5c0736b6b235fb1f54e750453e459df6c /sc/source | |
parent | 9d9de0ce0cd3717def37c7e520e14195bc6d1782 (diff) |
sal_Bool->bool
Change-Id: I8a94c5f44645d3ef03f231fe7b38c7e5637f8c09
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 22 | ||||
-rw-r--r-- | sc/source/ui/inc/dbdocfun.hxx | 14 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/unoobj/datauno.cxx | 4 |
4 files changed, 24 insertions, 24 deletions
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 6f94dc951f35..bc29e598a222 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------- -bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, sal_Bool /* bApi */ ) +bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, bool /* bApi */ ) { ScDocShellModificator aModificator( rDocShell ); @@ -425,8 +425,8 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo // ----------------------------------------------------------------- -sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, - sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi ) +bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, + bool bRecord, bool bPaint, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -578,7 +578,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, pDoc->Sort( nTab, aLocalParam, bRepeatQuery, &aProgress ); } - sal_Bool bSave = sal_True; + bool bSave = true; if (bCopy) { ScSortParam aOldSortParam; @@ -663,13 +663,13 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, aModificator.SetDocumentModified(); - return sal_True; + return true; } // ----------------------------------------------------------------- -sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, - const ScRange* pAdvSource, sal_Bool bRecord, sal_Bool bApi ) +bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, + const ScRange* pAdvSource, bool bRecord, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -925,7 +925,7 @@ sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, // speichern: Inplace immer, sonst je nach Einstellung // alter Inplace-Filter ist ggf. schon aufgehoben - sal_Bool bSave = rQueryParam.bInplace || rQueryParam.bDestPers; + bool bSave = rQueryParam.bInplace || rQueryParam.bDestPers; if (bSave) // merken { pDBData->SetQueryParam( rQueryParam ); @@ -1004,13 +1004,13 @@ sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, PAINT_GRID | PAINT_LEFT); aModificator.SetDocumentModified(); - return sal_True; + return true; } // ----------------------------------------------------------------- -sal_Bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, - const ScSortParam* pForceNewSort, sal_Bool bRecord, sal_Bool bApi ) +bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, + const ScSortParam* pForceNewSort, bool bRecord, bool bApi ) { //! auch fuer ScDBFunc::DoSubTotals benutzen! // dann bleibt aussen: diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index 1941fca8ae5d..a0b39fc6f58b 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -70,17 +70,17 @@ public: static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ); - sal_Bool Sort( SCTAB nTab, const ScSortParam& rSortParam, - sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi ); + bool Sort( SCTAB nTab, const ScSortParam& rSortParam, + bool bRecord, bool bPaint, bool bApi ); - SC_DLLPUBLIC sal_Bool Query( SCTAB nTab, const ScQueryParam& rQueryParam, - const ScRange* pAdvSource, sal_Bool bRecord, sal_Bool bApi ); + SC_DLLPUBLIC bool Query( SCTAB nTab, const ScQueryParam& rQueryParam, + const ScRange* pAdvSource, bool bRecord, bool bApi ); - sal_Bool DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, + bool DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, const ScSortParam* pForceNewSort, - sal_Bool bRecord, sal_Bool bApi ); + bool bRecord, bool bApi ); - bool AddDBRange( const OUString& rName, const ScRange& rRange, sal_Bool bApi ); + bool AddDBRange( const OUString& rName, const ScRange& rRange, bool bApi ); bool DeleteDBRange( const OUString& rName ); bool RenameDBRange( const OUString& rOld, const OUString& rNew ); bool ModifyDBData( const ScDBData& rNewData ); // Name unveraendert diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 5ae88f973456..b51961b4327b 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5618,7 +5618,7 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein - aFunc.Sort( nTab, aParam, sal_True, sal_True, sal_True ); + aFunc.Sort( nTab, aParam, true, true, true ); } } @@ -5728,7 +5728,7 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe //! if created by createFilterDescriptorByObject ??? ScDBDocFunc aFunc(*pDocSh); - aFunc.Query( nTab, aParam, NULL, sal_True, sal_True ); // Bereich muss angelegt sein + aFunc.Query( nTab, aParam, NULL, true, true ); // Bereich muss angelegt sein } } @@ -5874,7 +5874,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals( pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen ScDBDocFunc aFunc(*pDocSh); - aFunc.DoSubTotals( nTab, aParam, NULL, sal_True, sal_True ); // Bereich muss angelegt sein + aFunc.DoSubTotals( nTab, aParam, NULL, true, true ); // Bereich muss angelegt sein } } @@ -5901,7 +5901,7 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException) pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen ScDBDocFunc aFunc(*pDocSh); - aFunc.DoSubTotals( nTab, aParam, NULL, sal_True, sal_True ); // Bereich muss angelegt sein + aFunc.DoSubTotals( nTab, aParam, NULL, true, true ); // Bereich muss angelegt sein } } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 8ab87cab3f3b..18a93361cc72 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -2295,7 +2295,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, OUString aString(aName); ScRange aNameRange( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet, (SCCOL)aRange.EndColumn, (SCROW)aRange.EndRow, aRange.Sheet ); - bDone = aFunc.AddDBRange( aString, aNameRange, sal_True ); + bDone = aFunc.AddDBRange( aString, aNameRange, true ); } if (!bDone) throw uno::RuntimeException(); // no other exceptions specified @@ -2466,7 +2466,7 @@ void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRan OUString aString(STR_DB_LOCAL_NONAME); ScRange aUnnamedRange( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet, (SCCOL)aRange.EndColumn, (SCROW)aRange.EndRow, aRange.Sheet ); - bDone = aFunc.AddDBRange( aString, aUnnamedRange, sal_True ); + bDone = aFunc.AddDBRange( aString, aUnnamedRange, true ); } if (!bDone) throw uno::RuntimeException(); // no other exceptions specified |