sc/inc/addruno.hxx | 6 +++--- sc/inc/afmtuno.hxx | 4 ++-- sc/inc/arealink.hxx | 2 +- sc/inc/autoform.hxx | 4 ++-- sc/inc/bigrange.hxx | 14 +++++++------- sc/inc/cellsuno.hxx | 6 +++--- sc/inc/chartpos.hxx | 13 ++++++------- sc/source/core/tool/autoform.cxx | 8 ++++---- sc/source/core/tool/chartpos.cxx | 2 +- sc/source/ui/docshell/arealink.cxx | 6 +++--- sc/source/ui/unoobj/addruno.cxx | 20 ++++++++++---------- sc/source/ui/unoobj/cellsuno.cxx | 8 ++++---- sc/source/ui/unoobj/servuno.cxx | 4 ++-- 13 files changed, 48 insertions(+), 49 deletions(-)
New commits: commit d930faddc9e8c5d3ec933b423aa0fe8fc74060f9 Author: Noel Grandin <n...@peralex.com> Date: Fri Jan 17 12:04:53 2014 +0200 sal_Bool->bool Change-Id: Id38995252172df650e995504d929e265c023d2bc diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index 89fb675..4f1a234 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -180,15 +180,15 @@ public: { aStart.GetVars( nCol1, nRow1, nTab1 ); aEnd.GetVars( nCol2, nRow2, nTab2 ); } - sal_Bool IsValid( const ScDocument* pDoc ) const + bool IsValid( const ScDocument* pDoc ) const { return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); } inline ScRange MakeRange() const { return ScRange( aStart.MakeAddress(), aEnd.MakeAddress() ); } - inline sal_Bool In( const ScBigAddress& ) const; ///< is Address& in range? - inline sal_Bool In( const ScBigRange& ) const; ///< is Range& in range? - inline sal_Bool Intersects( const ScBigRange& ) const; ///< do two ranges overlap? + inline bool In( const ScBigAddress& ) const; ///< is Address& in range? + inline bool In( const ScBigRange& ) const; ///< is Range& in range? + inline bool Intersects( const ScBigRange& ) const; ///< do two ranges overlap? ScBigRange& operator=( const ScBigRange& r ) { aStart = r.aStart; aEnd = r.aEnd; return *this; } @@ -202,7 +202,7 @@ public: }; -inline sal_Bool ScBigRange::In( const ScBigAddress& rAddr ) const +inline bool ScBigRange::In( const ScBigAddress& rAddr ) const { return aStart.Col() <= rAddr.Col() && rAddr.Col() <= aEnd.Col() && @@ -211,7 +211,7 @@ inline sal_Bool ScBigRange::In( const ScBigAddress& rAddr ) const } -inline sal_Bool ScBigRange::In( const ScBigRange& r ) const +inline bool ScBigRange::In( const ScBigRange& r ) const { return aStart.Col() <= r.aStart.Col() && r.aEnd.Col() <= aEnd.Col() && @@ -220,7 +220,7 @@ inline sal_Bool ScBigRange::In( const ScBigRange& r ) const } -inline sal_Bool ScBigRange::Intersects( const ScBigRange& r ) const +inline bool ScBigRange::Intersects( const ScBigRange& r ) const { return !( std::min( aEnd.Col(), r.aEnd.Col() ) < std::max( aStart.Col(), r.aStart.Col() ) commit 300c8917dca86fc84ae0343598bf27a32d7e1a88 Author: Noel Grandin <n...@peralex.com> Date: Fri Jan 17 11:39:25 2014 +0200 sal_Bool->bool Change-Id: Iba9022efc96bf4e28e05305af089df4342d172fe diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index eea6b15..9c12752 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -244,8 +244,8 @@ public: void SetRotateAngle( const SfxInt32Item& rRotateAngle ) { aRotateAngle.SetValue( rRotateAngle.GetValue() ); } void SetRotateMode( const SvxRotateModeItem& rRotateMode ) { aRotateMode.SetValue( rRotateMode.GetValue() ); } - sal_Bool Load( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 nVer ); - sal_Bool Save( SvStream& rStream, sal_uInt16 fileVersion ); + bool Load( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 nVer ); + bool Save( SvStream& rStream, sal_uInt16 fileVersion ); }; diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index d1dc79a..cbf36cd 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -292,7 +292,7 @@ void ScAutoFormatDataField::SetAdjust( const SvxAdjustItem& rAdjust ) aItem = *(ItemType*)pNew; \ delete pNew; -sal_Bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 nVer ) +bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 nVer ) { SfxPoolItem* pNew; SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0 ); @@ -378,7 +378,7 @@ sal_Bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVe return (rStream.GetError() == 0); } -sal_Bool ScAutoFormatDataField::Save( SvStream& rStream, sal_uInt16 fileVersion ) +bool ScAutoFormatDataField::Save( SvStream& rStream, sal_uInt16 fileVersion ) { SvxOrientationItem aOrientation( aRotateAngle.GetValue(), aStacked.GetValue(), 0 ); @@ -791,7 +791,7 @@ bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions ) bool ScAutoFormatData::Save(SvStream& rStream, sal_uInt16 fileVersion) { sal_uInt16 nVal = AUTOFORMAT_DATA_ID; - sal_Bool b; + bool b; rStream.WriteUInt16( nVal ); // --- from 680/dr25 on: store strings as UTF-8 write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, aName, RTL_TEXTENCODING_UTF8); @@ -807,7 +807,7 @@ bool ScAutoFormatData::Save(SvStream& rStream, sal_uInt16 fileVersion) if (fileVersion >= SOFFICE_FILEFORMAT_50) WriteAutoFormatSwBlob( rStream, m_swFields ); - sal_Bool bRet = 0 == rStream.GetError(); + bool bRet = 0 == rStream.GetError(); for (sal_uInt16 i = 0; bRet && (i < 16); i++) bRet = GetField( i ).Save( rStream, fileVersion ); commit b6738a43dd8960088134f521cc6383dbf669a714 Author: Noel Grandin <n...@peralex.com> Date: Fri Jan 17 11:17:50 2014 +0200 sal_Bool->bool Change-Id: Ib45e3ffd62eca88afa31b7dd1b8c72499826d84c diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index ad15e32..86301c8 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -56,7 +56,7 @@ public: virtual void Edit( Window*, const Link& rEndEditHdl ); - sal_Bool Refresh( const OUString& rNewFile, const OUString& rNewFilter, + bool Refresh( const OUString& rNewFile, const OUString& rNewFilter, const OUString& rNewArea, sal_uLong nNewRefresh ); void SetInCreate(bool bSet) { bInCreate = bSet; } diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index f917e88..4e74118 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -229,7 +229,7 @@ bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUStr // ausfuehren: -sal_Bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, +bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, const OUString& rNewArea, sal_uLong nNewRefresh ) { // Dokument laden - wie TabLink @@ -311,7 +311,7 @@ sal_Bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilt } //! check CanFitBlock only if bDoInsert is set? - sal_Bool bCanDo = ValidColRow( aNewRange.aEnd.Col(), aNewRange.aEnd.Row() ) && + bool bCanDo = ValidColRow( aNewRange.aEnd.Col(), aNewRange.aEnd.Row() ) && pDoc->CanFitBlock( aOldRange, aNewRange ); if (bCanDo) { @@ -488,7 +488,7 @@ sal_Bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilt IMPL_LINK_NOARG(ScAreaLink, RefreshHdl) { long nRes = Refresh( aFileName, aFilterName, aSourceArea, - GetRefreshDelay() ) != 0; + GetRefreshDelay() ) == true; return nRes; } commit 4a7ad6083f448daf4dcae9a2396b1c748dc06705 Author: Noel Grandin <n...@peralex.com> Date: Fri Jan 17 10:50:02 2014 +0200 sal_Bool->bool Change-Id: I3b458d7dd89b74f54a74248e713b8eddef6f7347 diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 9ca1827..d6a35e5 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -136,7 +136,7 @@ class ScAutoFormatObj : public ::cppu::WeakImplHelper6< { private: SfxItemPropertySet aPropSet; - sal_uInt16 nFormatIndex; + sal_uInt16 nFormatIndex; ScAutoFormatFieldObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); @@ -147,7 +147,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // per getImplementation gerufen: - sal_Bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; } + bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; } void InitFormat( sal_uInt16 nNewIndex ); // XIndexAccess commit ed5065d8b080bfaf51ea1232cebf3ff72af1e640 Author: Noel Grandin <n...@peralex.com> Date: Fri Jan 17 10:44:39 2014 +0200 sal_Bool->bool Change-Id: I60449c23bd31900bff888a73c96acc1b46ce4a1c diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index 08e77f0..af644e4 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -37,13 +37,13 @@ private: ScDocShell* pDocShell; ScRange aRange; sal_Int32 nRefSheet; - sal_Bool bIsRange; + bool bIsRange; - sal_Bool ParseUIString( const OUString& rUIString, ::formula::FormulaGrammar::AddressConvention eConv = ::formula::FormulaGrammar::CONV_OOO ); + bool ParseUIString( const OUString& rUIString, ::formula::FormulaGrammar::AddressConvention eConv = ::formula::FormulaGrammar::CONV_OOO ); public: - ScAddressConversionObj(ScDocShell* pDocSh, sal_Bool bForRange); + ScAddressConversionObj(ScDocShell* pDocSh, bool bIsRange); virtual ~ScAddressConversionObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 1b874b7..9ebcb60 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -34,10 +34,10 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -ScAddressConversionObj::ScAddressConversionObj(ScDocShell* pDocSh, sal_Bool bForRange) : +ScAddressConversionObj::ScAddressConversionObj(ScDocShell* pDocSh, bool _bIsRange) : pDocShell( pDocSh ), nRefSheet( 0 ), - bIsRange( bForRange ) + bIsRange( _bIsRange ) { pDocShell->GetDocument()->AddUnoObject(*this); } @@ -57,13 +57,13 @@ void ScAddressConversionObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -sal_Bool ScAddressConversionObj::ParseUIString( const OUString& rUIString, ::formula::FormulaGrammar::AddressConvention eConv ) +bool ScAddressConversionObj::ParseUIString( const OUString& rUIString, ::formula::FormulaGrammar::AddressConvention eConv ) { if (!pDocShell) return false; ScDocument* pDoc = pDocShell->GetDocument(); - sal_Bool bSuccess = false; + bool bSuccess = false; if ( bIsRange ) { sal_uInt16 nResult = aRange.ParseAny( rUIString, pDoc, eConv ); @@ -75,7 +75,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const OUString& rUIString, ::for aRange.aEnd.SetTab( aRange.aStart.Tab() ); // different sheets are not supported in CellRangeAddress if ( aRange.aStart.Tab() == aRange.aEnd.Tab() ) - bSuccess = sal_True; + bSuccess = true; } } else @@ -85,7 +85,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const OUString& rUIString, ::for { if ( ( nResult & SCA_TAB_3D ) == 0 ) aRange.aStart.SetTab( static_cast<SCTAB>(nRefSheet) ); - bSuccess = sal_True; + bSuccess = true; } } return bSuccess; @@ -138,7 +138,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropert if ( !pDocShell ) throw uno::RuntimeException(); - sal_Bool bSuccess = false; + bool bSuccess = false; OUString aNameStr(aPropertyName); if ( aNameStr.equalsAscii( SC_UNONAME_ADDRESS ) ) { @@ -149,7 +149,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropert if ( aValue >>= aRangeAddress ) { ScUnoConversion::FillScRange( aRange, aRangeAddress ); - bSuccess = sal_True; + bSuccess = true; } } else @@ -158,7 +158,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropert if ( aValue >>= aCellAddress ) { ScUnoConversion::FillScAddress( aRange.aStart, aCellAddress ); - bSuccess = sal_True; + bSuccess = true; } } } @@ -169,7 +169,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropert if ( aValue >>= nIntVal ) { nRefSheet = nIntVal; - bSuccess = sal_True; + bSuccess = true; } } else if ( aNameStr.equalsAscii( SC_UNONAME_UIREPR ) ) diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 0347209..9ca7b2f 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -581,8 +581,8 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( case SC_SERVICE_RANGEADDRESS: if (pDocShell) { - sal_Bool bRange = ( nType == SC_SERVICE_RANGEADDRESS ); - xRet.set(*new ScAddressConversionObj( pDocShell, bRange )); + bool bIsRange = ( nType == SC_SERVICE_RANGEADDRESS ); + xRet.set(*new ScAddressConversionObj( pDocShell, bIsRange )); } break; commit 6c67173f0b7ff104709a96ce7b990796559343ad Author: Noel Grandin <n...@peralex.com> Date: Fri Jan 17 09:52:28 2014 +0200 remove unused method setDummyUpperLeft Change-Id: I1e24a50e9ca10140561c308317b47f5ae6396add diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index eda1a0b..276b2da 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -136,7 +136,6 @@ public: void SetHeaders(bool bCol, bool bRow) { bColHeaders=bCol; bRowHeaders=bRow; } bool HasColHeaders() const { return bColHeaders; } bool HasRowHeaders() const { return bRowHeaders; } - void SetDummyUpperLeft(bool bNew) { bDummyUpperLeft = bNew; } void SeteGlue(ScChartGlue eNew) { eGlue = eNew; } void SetStartCol(SCCOL nNew) { nStartCol = nNew; } void SetStartRow(SCROW nNew) { nStartRow = nNew; } commit ab6fe4267d428947a5eb9e7998ff03fc167e2cd8 Author: Noel Grandin <n...@peralex.com> Date: Fri Jan 17 09:51:59 2014 +0200 sal_Bool->bool Change-Id: Ife994f88e0536a6bdd414deacc2c1e0315ad312f diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index af9bc66..eda1a0b 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -110,9 +110,9 @@ class ScChartPositioner // only parameter struct ScChartGlue eGlue; SCCOL nStartCol; SCROW nStartRow; - sal_Bool bColHeaders; - sal_Bool bRowHeaders; - sal_Bool bDummyUpperLeft; + bool bColHeaders; + bool bRowHeaders; + bool bDummyUpperLeft; private: void CheckColRowHeaders(); @@ -133,10 +133,10 @@ public: void SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; } void SetRangeList( const ScRange& rNew ); - void SetHeaders(sal_Bool bCol, sal_Bool bRow) { bColHeaders=bCol; bRowHeaders=bRow; } - sal_Bool HasColHeaders() const { return bColHeaders; } - sal_Bool HasRowHeaders() const { return bRowHeaders; } - void SetDummyUpperLeft(sal_Bool bNew) { bDummyUpperLeft = bNew; } + void SetHeaders(bool bCol, bool bRow) { bColHeaders=bCol; bRowHeaders=bRow; } + bool HasColHeaders() const { return bColHeaders; } + bool HasRowHeaders() const { return bRowHeaders; } + void SetDummyUpperLeft(bool bNew) { bDummyUpperLeft = bNew; } void SeteGlue(ScChartGlue eNew) { eGlue = eNew; } void SetStartCol(SCCOL nNew) { nStartCol = nNew; } void SetStartRow(SCROW nNew) { nStartRow = nNew; } diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index a64c5ff..af15c2f 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -263,7 +263,7 @@ void ScChartPositioner::GlueState() else eGlue = SC_CHARTGLUE_COLS; if ( *pA != nOccu ) - bDummyUpperLeft = sal_True; + bDummyUpperLeft = true; } else { commit e3509a737480f8cb843dc416f5b6ebdd0f643e75 Author: Noel Grandin <n...@peralex.com> Date: Fri Jan 17 09:43:49 2014 +0200 sal_Bool->bool Change-Id: I8d2cdb9784a04cb120f2c6921ba56391d6fa6c7b diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 74cd07c..4e85421 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -186,10 +186,10 @@ private: ScMarkData* pMarkData; ScRangeList aRanges; sal_Int64 nObjectId; - sal_Bool bChartColAsHdr; - sal_Bool bChartRowAsHdr; + bool bChartColAsHdr; + bool bChartRowAsHdr; bool bCursorOnly; - sal_Bool bGotDataChangedHint; + bool bGotDataChangedHint; XModifyListenerArr_Impl aValueListeners; DECL_LINK( ValueListenerHdl, SfxHint* ); diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 6340667e..d4c01cc 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1581,7 +1581,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) // any change of the range address is broadcast to value (modify) listeners if ( !aValueListeners.empty() ) - bGotDataChangedHint = sal_True; + bGotDataChangedHint = true; if ( pUndoRanges ) pDoc->AddUnoRefChange( nObjectId, *pUndoRanges ); @@ -1645,7 +1645,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) // (SFX_HINT_DATACHANGED follows separately) if ( !aValueListeners.empty() ) - bGotDataChangedHint = sal_True; + bGotDataChangedHint = true; } } else if ( rHint.ISA( ScUnoRefUndoHint ) ) @@ -1659,7 +1659,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) RefChanged(); if ( !aValueListeners.empty() ) - bGotDataChangedHint = sal_True; // need to broadcast the undo, too + bGotDataChangedHint = true; // need to broadcast the undo, too } } } @@ -2788,7 +2788,7 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint ) // in the range are notified. So only a flag is set that is checked when // SFX_HINT_DATACHANGED is received. - bGotDataChangedHint = sal_True; + bGotDataChangedHint = true; } return 0; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits