Kaydet (Commit) 11679c2c authored tarafından Noel Grandin's avatar Noel Grandin

sal_Bool->bool

Change-Id: Iee828ef0f5f4ed0192291c4681fbc8df6e863b7e
üst 5d388248
...@@ -49,7 +49,7 @@ public: ...@@ -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. /** 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. 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 // 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 ); 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 );
......
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
// from SvxUnoDrawPool // from SvxUnoDrawPool
virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE;
}; };
#endif #endif
......
...@@ -50,7 +50,7 @@ void ScDrawDefaultsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) ...@@ -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; SfxItemPool* pRet = NULL;
......
...@@ -78,7 +78,7 @@ void SvxUnoDrawPool::init() ...@@ -78,7 +78,7 @@ void SvxUnoDrawPool::init()
mpDefaultsPool->FreezeIdRanges(); mpDefaultsPool->FreezeIdRanges();
} }
SfxItemPool* SvxUnoDrawPool::getModelPool( sal_Bool bReadOnly ) throw() SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw()
{ {
if( mpModel ) if( mpModel )
{ {
...@@ -204,7 +204,7 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp ...@@ -204,7 +204,7 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
SfxItemPool* pPool = getModelPool( sal_False ); SfxItemPool* pPool = getModelPool( false );
DBG_ASSERT( pPool, "I need a SfxItemPool!" ); DBG_ASSERT( pPool, "I need a SfxItemPool!" );
if( NULL == pPool ) if( NULL == pPool )
...@@ -219,7 +219,7 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp ...@@ -219,7 +219,7 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
SfxItemPool* pPool = getModelPool( sal_True ); SfxItemPool* pPool = getModelPool( true );
DBG_ASSERT( pPool, "I need a SfxItemPool!" ); DBG_ASSERT( pPool, "I need a SfxItemPool!" );
if( NULL == pPool ) if( NULL == pPool )
...@@ -234,7 +234,7 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp ...@@ -234,7 +234,7 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
SfxItemPool* pPool = getModelPool( sal_True ); SfxItemPool* pPool = getModelPool( true );
if( pPool && pPool != mpDefaultsPool ) if( pPool && pPool != mpDefaultsPool )
{ {
...@@ -297,7 +297,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* ...@@ -297,7 +297,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
SfxItemPool* pPool = getModelPool( sal_True ); SfxItemPool* pPool = getModelPool( true );
// OD 10.10.2003 #i18732# // OD 10.10.2003 #i18732#
// Assure, that ID is a Which-ID (it could be a Slot-ID.) // Assure, that ID is a Which-ID (it could be a Slot-ID.)
...@@ -319,7 +319,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry ...@@ -319,7 +319,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry
// OD 13.10.2003 #i18732# - use method <GetPoolDefaultItem(..)> instead of // OD 13.10.2003 #i18732# - use method <GetPoolDefaultItem(..)> instead of
// using probably incompatible item pool <mpDefaultsPool> // using probably incompatible item pool <mpDefaultsPool>
uno::Any aAny; uno::Any aAny;
SfxItemPool* pPool = getModelPool( sal_True ); SfxItemPool* pPool = getModelPool( true );
const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ); const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich ); const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich );
pItem->QueryValue( aAny, pEntry->mnMemberId ); pItem->QueryValue( aAny, pEntry->mnMemberId );
......
...@@ -32,7 +32,7 @@ SwSvxUnoDrawPool::~SwSvxUnoDrawPool() throw() ...@@ -32,7 +32,7 @@ SwSvxUnoDrawPool::~SwSvxUnoDrawPool() throw()
{ {
} }
SfxItemPool* SwSvxUnoDrawPool::getModelPool( sal_Bool /*bReadOnly*/ ) throw() SfxItemPool* SwSvxUnoDrawPool::getModelPool( bool /*bReadOnly*/ ) throw()
{ {
if(m_pDoc) if(m_pDoc)
{ {
......
...@@ -30,7 +30,7 @@ public: ...@@ -30,7 +30,7 @@ public:
SwSvxUnoDrawPool( SwDoc* pDoc ) throw(); SwSvxUnoDrawPool( SwDoc* pDoc ) throw();
virtual ~SwSvxUnoDrawPool() throw(); virtual ~SwSvxUnoDrawPool() throw();
virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE;
void Invalidate() {m_pDoc = 0;} void Invalidate() {m_pDoc = 0;}
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment