diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-11 14:00:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-12 09:01:07 +0200 |
commit | 11679c2c20241b6b3f6f8982b18c822e978ee76b (patch) | |
tree | 980ef354bc89048efb04fe60899ff5cdf84d188a | |
parent | 5d38824834b68e32062984f30acac7a741eda535 (diff) |
sal_Bool->bool
Change-Id: Iee828ef0f5f4ed0192291c4681fbc8df6e863b7e
-rw-r--r-- | include/svx/unopool.hxx | 2 | ||||
-rw-r--r-- | sc/inc/drdefuno.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/drdefuno.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unopool.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/uno/unodefaults.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uno/unodefaults.hxx | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index 98146e5a317c..7d7bd4ed4f68 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -49,7 +49,7 @@ public: /** This returns the item pool from the given model, or the default pool if there is no model and bReadOnly is true. If bReadOnly is false and there is no model the default implementation returns NULL. */ - virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); + virtual SfxItemPool* getModelPool( bool bReadOnly ) throw(); // overiden helpers from comphelper::PropertySetHelper virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx index 93cdd1b98047..0c0ea7e4d9cb 100644 --- a/sc/inc/drdefuno.hxx +++ b/sc/inc/drdefuno.hxx @@ -37,7 +37,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // from SvxUnoDrawPool - virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); + virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx index d97cf37ca3ec..12de924bea6f 100644 --- a/sc/source/ui/unoobj/drdefuno.cxx +++ b/sc/source/ui/unoobj/drdefuno.cxx @@ -50,7 +50,7 @@ void ScDrawDefaultsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -SfxItemPool* ScDrawDefaultsObj::getModelPool( sal_Bool bReadOnly ) throw() +SfxItemPool* ScDrawDefaultsObj::getModelPool( bool bReadOnly ) throw() { SfxItemPool* pRet = NULL; diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index be3b0dd01437..c8f71edcdaee 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -78,7 +78,7 @@ void SvxUnoDrawPool::init() mpDefaultsPool->FreezeIdRanges(); } -SfxItemPool* SvxUnoDrawPool::getModelPool( sal_Bool bReadOnly ) throw() +SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw() { if( mpModel ) { @@ -204,7 +204,7 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp { SolarMutexGuard aGuard; - SfxItemPool* pPool = getModelPool( sal_False ); + SfxItemPool* pPool = getModelPool( false ); DBG_ASSERT( pPool, "I need a SfxItemPool!" ); if( NULL == pPool ) @@ -219,7 +219,7 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp { SolarMutexGuard aGuard; - SfxItemPool* pPool = getModelPool( sal_True ); + SfxItemPool* pPool = getModelPool( true ); DBG_ASSERT( pPool, "I need a SfxItemPool!" ); if( NULL == pPool ) @@ -234,7 +234,7 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp { SolarMutexGuard aGuard; - SfxItemPool* pPool = getModelPool( sal_True ); + SfxItemPool* pPool = getModelPool( true ); if( pPool && pPool != mpDefaultsPool ) { @@ -297,7 +297,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* { SolarMutexGuard aGuard; - SfxItemPool* pPool = getModelPool( sal_True ); + SfxItemPool* pPool = getModelPool( true ); // OD 10.10.2003 #i18732# // Assure, that ID is a Which-ID (it could be a Slot-ID.) @@ -319,7 +319,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry // OD 13.10.2003 #i18732# - use method <GetPoolDefaultItem(..)> instead of // using probably incompatible item pool <mpDefaultsPool> uno::Any aAny; - SfxItemPool* pPool = getModelPool( sal_True ); + SfxItemPool* pPool = getModelPool( true ); const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ); const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich ); pItem->QueryValue( aAny, pEntry->mnMemberId ); diff --git a/sw/source/ui/uno/unodefaults.cxx b/sw/source/ui/uno/unodefaults.cxx index 5da8486f9edf..1959f742947c 100644 --- a/sw/source/ui/uno/unodefaults.cxx +++ b/sw/source/ui/uno/unodefaults.cxx @@ -32,7 +32,7 @@ SwSvxUnoDrawPool::~SwSvxUnoDrawPool() throw() { } -SfxItemPool* SwSvxUnoDrawPool::getModelPool( sal_Bool /*bReadOnly*/ ) throw() +SfxItemPool* SwSvxUnoDrawPool::getModelPool( bool /*bReadOnly*/ ) throw() { if(m_pDoc) { diff --git a/sw/source/ui/uno/unodefaults.hxx b/sw/source/ui/uno/unodefaults.hxx index 093d9b4c0e2a..1006b0eaba70 100644 --- a/sw/source/ui/uno/unodefaults.hxx +++ b/sw/source/ui/uno/unodefaults.hxx @@ -30,7 +30,7 @@ public: SwSvxUnoDrawPool( SwDoc* pDoc ) throw(); virtual ~SwSvxUnoDrawPool() throw(); - virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); + virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE; void Invalidate() {m_pDoc = 0;} }; |