diff options
author | Noel Grandin <noel@peralex.com> | 2014-01-17 10:44:39 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-01-17 13:43:49 +0200 |
commit | ed5065d8b080bfaf51ea1232cebf3ff72af1e640 (patch) | |
tree | 95ac51bb17ca75621e9597d6180e20b29b36e6f8 | |
parent | 6c67173f0b7ff104709a96ce7b990796559343ad (diff) |
sal_Bool->bool
Change-Id: I60449c23bd31900bff888a73c96acc1b46ce4a1c
-rw-r--r-- | sc/inc/addruno.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/addruno.cxx | 20 | ||||
-rw-r--r-- | sc/source/ui/unoobj/servuno.cxx | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index 08e77f0e3b9c..af644e43f80f 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 1b874b77f33b..9ebcb601e9c2 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 0347209f7e52..9ca7b2f82e37 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; |