diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-11-09 21:36:54 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-11-09 21:36:54 +0100 |
| commit | 78fed9b8623faca46c3e1ef4dc633d80682d0414 (patch) | |
| tree | 71061db5cdcdd8ab7702148e763866f007db41d3 /chart2/source/controller/main/UndoGuard.cxx | |
| parent | undoapi: step 0.0 of the migration of css.chart2.XUndoManager to css.document... (diff) | |
| download | core-78fed9b8623faca46c3e1ef4dc633d80682d0414.tar.gz core-78fed9b8623faca46c3e1ef4dc633d80682d0414.zip | |
undoapi: step 0.1 of the migration of css.chart2.XUndoManager to css.document.XUndoManager: remove the XModel paramter from the XUndoManager methods, they're an implicit attribute of the instance
Diffstat (limited to 'chart2/source/controller/main/UndoGuard.cxx')
| -rw-r--r-- | chart2/source/controller/main/UndoGuard.cxx | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 8513b6ba9093..d55d52f8d41e 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -40,10 +40,8 @@ namespace chart { UndoGuard_Base::UndoGuard_Base( const OUString& rUndoString - , const uno::Reference< chart2::XUndoManager > & xUndoManager - , const uno::Reference< frame::XModel > & xModel ) - : m_xModel( xModel ) - , m_xUndoManager( xUndoManager ) + , const uno::Reference< chart2::XUndoManager > & xUndoManager ) + : m_xUndoManager( xUndoManager ) , m_aUndoString( rUndoString ) , m_bActionPosted( false ) { @@ -63,12 +61,11 @@ void UndoGuard_Base::commitAction() //----------------------------------------------------------------------------- UndoGuard::UndoGuard( const OUString& rUndoString - , const uno::Reference< chart2::XUndoManager > & xUndoManager - , const uno::Reference< frame::XModel > & xModel ) - : UndoGuard_Base( rUndoString, xUndoManager, xModel ) + , const uno::Reference< chart2::XUndoManager > & xUndoManager ) + : UndoGuard_Base( rUndoString, xUndoManager ) { if( m_xUndoManager.is() ) - m_xUndoManager->preAction( m_xModel ); + m_xUndoManager->preAction(); } UndoGuard::~UndoGuard() @@ -80,26 +77,24 @@ UndoGuard::~UndoGuard() //----------------------------------------------------------------------------- UndoLiveUpdateGuard::UndoLiveUpdateGuard( const OUString& rUndoString - , const uno::Reference< chart2::XUndoManager > & xUndoManager - , const uno::Reference< frame::XModel > & xModel ) - : UndoGuard_Base( rUndoString, xUndoManager, xModel ) + , const uno::Reference< chart2::XUndoManager > & xUndoManager ) + : UndoGuard_Base( rUndoString, xUndoManager ) { if( m_xUndoManager.is() ) - m_xUndoManager->preAction( m_xModel ); + m_xUndoManager->preAction(); } UndoLiveUpdateGuard::~UndoLiveUpdateGuard() { if( !m_bActionPosted && m_xUndoManager.is() ) - m_xUndoManager->cancelActionWithUndo( m_xModel ); + m_xUndoManager->cancelActionWithUndo(); } //----------------------------------------------------------------------------- UndoLiveUpdateGuardWithData::UndoLiveUpdateGuardWithData( const OUString& rUndoString - , const uno::Reference< chart2::XUndoManager > & xUndoManager - , const uno::Reference< frame::XModel > & xModel ) - : UndoGuard_Base( rUndoString, xUndoManager, xModel ) + , const uno::Reference< chart2::XUndoManager > & xUndoManager ) + : UndoGuard_Base( rUndoString, xUndoManager ) { if( m_xUndoManager.is() ) { @@ -107,22 +102,21 @@ UndoLiveUpdateGuardWithData::UndoLiveUpdateGuardWithData( const OUString& rUndoS aArgs[0] = beans::PropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("WithData")), -1, uno::Any(), beans::PropertyState_DIRECT_VALUE ); - m_xUndoManager->preActionWithArguments( m_xModel, aArgs ); + m_xUndoManager->preActionWithArguments( aArgs ); } } UndoLiveUpdateGuardWithData::~UndoLiveUpdateGuardWithData() { if( !m_bActionPosted && m_xUndoManager.is() ) - m_xUndoManager->cancelActionWithUndo( m_xModel ); + m_xUndoManager->cancelActionWithUndo(); } //----------------------------------------------------------------------------- UndoGuardWithSelection::UndoGuardWithSelection( const rtl::OUString& rUndoString - , const uno::Reference< chart2::XUndoManager > & xUndoManager - , const uno::Reference< frame::XModel > & xModel ) - : UndoGuard_Base( rUndoString, xUndoManager, xModel ) + , const uno::Reference< chart2::XUndoManager > & xUndoManager ) + : UndoGuard_Base( rUndoString, xUndoManager ) { if( m_xUndoManager.is() ) { @@ -130,7 +124,7 @@ UndoGuardWithSelection::UndoGuardWithSelection( const rtl::OUString& rUndoString aArgs[0] = beans::PropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("WithSelection")), -1, uno::Any(), beans::PropertyState_DIRECT_VALUE ); - m_xUndoManager->preActionWithArguments( m_xModel, aArgs ); + m_xUndoManager->preActionWithArguments( aArgs ); } } |