diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:41:33 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:44 +0000 |
commit | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch) | |
tree | 56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /framework | |
parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/fwe/helper/documentundoguard.cxx | 6 | ||||
-rw-r--r-- | framework/source/fwe/helper/undomanagerhelper.cxx | 54 |
2 files changed, 30 insertions, 30 deletions
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx index 35ed6b431b1b..f055b0cc5877 100644 --- a/framework/source/fwe/helper/documentundoguard.cxx +++ b/framework/source/fwe/helper/documentundoguard.cxx @@ -220,14 +220,14 @@ namespace framework //= DocumentUndoGuard DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent ) - :m_pData( new DocumentUndoGuard_Data ) + :m_xData( new DocumentUndoGuard_Data ) { - lcl_init( *m_pData, i_undoSupplierComponent ); + lcl_init( *m_xData, i_undoSupplierComponent ); } DocumentUndoGuard::~DocumentUndoGuard() { - lcl_restore( *m_pData ); + lcl_restore( *m_xData ); } } // namespace framework diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 8244b1f57d59..8b0c9c58593d 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -876,7 +876,7 @@ namespace framework //= UndoManagerHelper UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl ) - :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) ) + :m_xImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) ) { } @@ -886,22 +886,22 @@ namespace framework void UndoManagerHelper::disposing() { - m_pImpl->disposing(); + m_xImpl->disposing(); } void UndoManagerHelper::enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock ) { - m_pImpl->enterUndoContext( i_title, false, i_instanceLock ); + m_xImpl->enterUndoContext( i_title, false, i_instanceLock ); } void UndoManagerHelper::enterHiddenUndoContext( IMutexGuard& i_instanceLock ) { - m_pImpl->enterUndoContext( OUString(), true, i_instanceLock ); + m_xImpl->enterUndoContext( OUString(), true, i_instanceLock ); } void UndoManagerHelper::leaveUndoContext( IMutexGuard& i_instanceLock ) { - m_pImpl->leaveUndoContext( i_instanceLock ); + m_xImpl->leaveUndoContext( i_instanceLock ); } void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock ) @@ -932,24 +932,24 @@ namespace framework void UndoManagerHelper::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { - m_pImpl->addUndoAction( i_action, i_instanceLock ); + m_xImpl->addUndoAction( i_action, i_instanceLock ); } void UndoManagerHelper::undo( IMutexGuard& i_instanceLock ) { - m_pImpl->undo( i_instanceLock ); + m_xImpl->undo( i_instanceLock ); } void UndoManagerHelper::redo( IMutexGuard& i_instanceLock ) { - m_pImpl->redo( i_instanceLock ); + m_xImpl->redo( i_instanceLock ); } bool UndoManagerHelper::isUndoPossible() const { // SYNCHRONIZED ---> - ::osl::MutexGuard aGuard( m_pImpl->getMutex() ); - IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + ::osl::MutexGuard aGuard( m_xImpl->getMutex() ); + IUndoManager& rUndoManager = m_xImpl->getUndoManager(); if ( rUndoManager.IsInListAction() ) return false; return rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) > 0; @@ -959,8 +959,8 @@ namespace framework bool UndoManagerHelper::isRedoPossible() const { // SYNCHRONIZED ---> - ::osl::MutexGuard aGuard( m_pImpl->getMutex() ); - const IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + ::osl::MutexGuard aGuard( m_xImpl->getMutex() ); + const IUndoManager& rUndoManager = m_xImpl->getUndoManager(); if ( rUndoManager.IsInListAction() ) return false; return rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0; @@ -1015,55 +1015,55 @@ namespace framework OUString UndoManagerHelper::getCurrentUndoActionTitle() const { - return lcl_getCurrentActionTitle( *m_pImpl, true ); + return lcl_getCurrentActionTitle( *m_xImpl, true ); } OUString UndoManagerHelper::getCurrentRedoActionTitle() const { - return lcl_getCurrentActionTitle( *m_pImpl, false ); + return lcl_getCurrentActionTitle( *m_xImpl, false ); } Sequence< OUString > UndoManagerHelper::getAllUndoActionTitles() const { - return lcl_getAllActionTitles( *m_pImpl, true ); + return lcl_getAllActionTitles( *m_xImpl, true ); } Sequence< OUString > UndoManagerHelper::getAllRedoActionTitles() const { - return lcl_getAllActionTitles( *m_pImpl, false ); + return lcl_getAllActionTitles( *m_xImpl, false ); } void UndoManagerHelper::clear( IMutexGuard& i_instanceLock ) { - m_pImpl->clear( i_instanceLock ); + m_xImpl->clear( i_instanceLock ); } void UndoManagerHelper::clearRedo( IMutexGuard& i_instanceLock ) { - m_pImpl->clearRedo( i_instanceLock ); + m_xImpl->clearRedo( i_instanceLock ); } void UndoManagerHelper::reset( IMutexGuard& i_instanceLock ) { - m_pImpl->reset( i_instanceLock ); + m_xImpl->reset( i_instanceLock ); } void UndoManagerHelper::lock() { - m_pImpl->lock(); + m_xImpl->lock(); } void UndoManagerHelper::unlock() { - m_pImpl->unlock(); + m_xImpl->unlock(); } bool UndoManagerHelper::isLocked() { // SYNCHRONIZED ---> - ::osl::MutexGuard aGuard( m_pImpl->getMutex() ); + ::osl::MutexGuard aGuard( m_xImpl->getMutex() ); - IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + IUndoManager& rUndoManager = m_xImpl->getUndoManager(); return !rUndoManager.IsUndoEnabled(); // <--- SYNCHRONIZED } @@ -1071,25 +1071,25 @@ namespace framework void UndoManagerHelper::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) - m_pImpl->addUndoManagerListener( i_listener ); + m_xImpl->addUndoManagerListener( i_listener ); } void UndoManagerHelper::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) - m_pImpl->removeUndoManagerListener( i_listener ); + m_xImpl->removeUndoManagerListener( i_listener ); } void UndoManagerHelper::addModifyListener( const Reference< XModifyListener >& i_listener ) { if ( i_listener.is() ) - m_pImpl->addModifyListener( i_listener ); + m_xImpl->addModifyListener( i_listener ); } void UndoManagerHelper::removeModifyListener( const Reference< XModifyListener >& i_listener ) { if ( i_listener.is() ) - m_pImpl->removeModifyListener( i_listener ); + m_xImpl->removeModifyListener( i_listener ); } } // namespace framework |