User: hr Date: 2007-08-02 14:39:16+0000 Modified: dba/reportdesign/source/ui/misc/Undo.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/18 09:24:14 oj 1.2.2.1: correct undo actions File Changes: Directory: /dba/reportdesign/source/ui/misc/ ============================================ File [changed]: Undo.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/misc/Undo.cxx?r1=1.2&r2=1.3 Delta lines: +38 -59 --------------------- --- Undo.cxx 2007-07-09 11:56:32+0000 1.2 +++ Undo.cxx 2007-08-02 14:39:14+0000 1.3 @@ -179,8 +179,6 @@ // ----------------------------------------------------------------------------- void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xSection) { - OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); - const OXUndoEnvironment::OUndoEnvLock aLock(rEnv); m_aControls.clear(); try { @@ -203,11 +201,6 @@ //---------------------------------------------------------------------------- void OSectionUndo::Undo() { - OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); - if ( !rEnv.IsLocked() ) - { - const OXUndoEnvironment::OUndoEnvLock aLock(rEnv); - //rEnv.Lock(); try { switch ( m_eAction ) @@ -225,18 +218,10 @@ { OSL_ENSURE( sal_False, "OSectionUndo::Undo: caught an exception!" ); } - //rEnv.UnLock(); - } - } //---------------------------------------------------------------------------- void OSectionUndo::Redo() { - OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); - if ( !rEnv.IsLocked() ) - { - OXUndoEnvironment::OUndoEnvLock aLock(rEnv); - //rEnv.Lock(); try { switch ( m_eAction ) @@ -254,11 +239,9 @@ { OSL_ENSURE( sal_False, "OSectionUndo::Redo: caught an exception!" ); } - //rEnv.UnLock(); - } } //---------------------------------------------------------------------------- -TYPEINIT1( OReportSectionUndo, OCommentUndoAction ); +TYPEINIT1( OReportSectionUndo, OSectionUndo ); //---------------------------------------------------------------------------- OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,::std::mem_fun_t< uno::Reference< report::XSection > @@ -427,8 +410,6 @@ //---------------------------------------------------------------------------- void OGroupUndo::Undo() { - OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); - const OXUndoEnvironment::OUndoEnvLock aLock(rEnv); switch ( m_eAction ) { case Inserted: @@ -444,8 +425,6 @@ //---------------------------------------------------------------------------- void OGroupUndo::Redo() { - OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); - const OXUndoEnvironment::OUndoEnvLock aLock(rEnv); switch ( m_eAction ) { case Inserted: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
