diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 13:43:17 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 16:24:05 +0000 |
commit | 3744d8506ef231d642785faf6da4926cea64c6a0 (patch) | |
tree | 2d57ca5be9eda54aafb5065d7010bb50a37053ac /svx/source/unodraw | |
parent | 7a17c038a6f4c433a69c6c1ed04aca2e5c929027 (diff) |
boost->std
Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r-- | svx/source/unodraw/shapepropertynotifier.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 19bd256ece08..9c286f23c856 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -99,7 +99,7 @@ namespace svx } PropertyChangeNotifier::PropertyChangeNotifier( ::cppu::OWeakObject& _rOwner, ::osl::Mutex& _rMutex ) - :m_pData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) ) + :m_xData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) ) { } @@ -114,10 +114,10 @@ namespace svx ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" ); ENSURE_OR_THROW( !!_pProvider, "NULL factory not allowed." ); - OSL_ENSURE( m_pData->m_aProviders.find( _eProperty ) == m_pData->m_aProviders.end(), + OSL_ENSURE( m_xData->m_aProviders.find( _eProperty ) == m_xData->m_aProviders.end(), "PropertyChangeNotifier::registerProvider: factory for this ID already present!" ); - m_pData->m_aProviders[ _eProperty ] = _pProvider; + m_xData->m_aProviders[ _eProperty ] = _pProvider; } @@ -125,22 +125,22 @@ namespace svx { ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" ); - PropertyProviders::const_iterator provPos = m_pData->m_aProviders.find( _eProperty ); - OSL_ENSURE( provPos != m_pData->m_aProviders.end(), "PropertyChangeNotifier::notifyPropertyChange: no factory!" ); - if ( provPos == m_pData->m_aProviders.end() ) + PropertyProviders::const_iterator provPos = m_xData->m_aProviders.find( _eProperty ); + OSL_ENSURE( provPos != m_xData->m_aProviders.end(), "PropertyChangeNotifier::notifyPropertyChange: no factory!" ); + if ( provPos == m_xData->m_aProviders.end() ) return; OUString sPropertyName( provPos->second->getPropertyName() ); - ::cppu::OInterfaceContainerHelper* pPropListeners = m_pData->m_aPropertyChangeListeners.getContainer( sPropertyName ); - ::cppu::OInterfaceContainerHelper* pAllListeners = m_pData->m_aPropertyChangeListeners.getContainer( OUString() ); + ::cppu::OInterfaceContainerHelper* pPropListeners = m_xData->m_aPropertyChangeListeners.getContainer( sPropertyName ); + ::cppu::OInterfaceContainerHelper* pAllListeners = m_xData->m_aPropertyChangeListeners.getContainer( OUString() ); if ( !pPropListeners && !pAllListeners ) return; try { PropertyChangeEvent aEvent; - aEvent.Source = m_pData->m_rContext; + aEvent.Source = m_xData->m_rContext; // Handle/OldValue not supported aEvent.PropertyName = provPos->second->getPropertyName(); provPos->second->getCurrentValue( aEvent.NewValue ); @@ -159,21 +159,21 @@ namespace svx void PropertyChangeNotifier::addPropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { - m_pData->m_aPropertyChangeListeners.addInterface( _rPropertyName, _rxListener ); + m_xData->m_aPropertyChangeListeners.addInterface( _rPropertyName, _rxListener ); } void PropertyChangeNotifier::removePropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { - m_pData->m_aPropertyChangeListeners.removeInterface( _rPropertyName, _rxListener ); + m_xData->m_aPropertyChangeListeners.removeInterface( _rPropertyName, _rxListener ); } void PropertyChangeNotifier::disposing() { EventObject aEvent; - aEvent.Source = m_pData->m_rContext; - m_pData->m_aPropertyChangeListeners.disposeAndClear( aEvent ); + aEvent.Source = m_xData->m_rContext; + m_xData->m_aPropertyChangeListeners.disposeAndClear( aEvent ); } |