User: hr Date: 2007-08-03 09:59:44+0000 Modified: dba/reportdesign/source/ui/dlg/CondFormat.cxx
Log: INTEGRATION: CWS rpt23fix02 (1.2.4); FILE MERGED 2007/08/01 07:43:32 oj 1.2.4.3: #i80161# patch for ModuleRes 2007/07/27 12:21:58 oj 1.2.4.2: #i77907# remove entries from context when propbrw is destroyed 2007/07/25 14:07:01 oj 1.2.4.1: #i77721# #i79958# dnd and selection across sections impl File Changes: Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: CondFormat.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/CondFormat.cxx?r1=1.2&r2=1.3 Delta lines: +9 -6 ------------------- --- CondFormat.cxx 2007-07-09 11:56:29+0000 1.2 +++ CondFormat.cxx 2007-08-03 09:59:41+0000 1.3 @@ -69,6 +69,7 @@ #include <comphelper/property.hxx> #include <algorithm> +#include "UndoActions.hxx" // ............................................................................. namespace rptui @@ -109,6 +110,7 @@ //======================================================================== // class ConditionalFormattingDialog //======================================================================== + DBG_NAME(rpt_ConditionalFormattingDialog) ConditionalFormattingDialog::ConditionalFormattingDialog( Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController ) :ModalDialog( _pParent, ModuleRes(RID_CONDFORMAT) ) @@ -122,6 +124,7 @@ ,m_xFormatConditions( _rxFormatConditions ) ,m_bDeletingCondition( false ) { + DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); OSL_ENSURE( m_xFormatConditions.is(), "ConditionalFormattingDialog::ConditionalFormattingDialog: ReportControlModel is NULL -> Prepare for GPF!" ); m_xCopy.set( m_xFormatConditions->createClone(), UNO_QUERY_THROW ); @@ -137,6 +140,7 @@ ConditionalFormattingDialog::~ConditionalFormattingDialog() { m_aConditions.clear(); + DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); } // ----------------------------------------------------------------------------- @@ -473,8 +477,8 @@ short nRet = ModalDialog::Execute(); if ( nRet == RET_OK ) { - String sUndoAction( String( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) ) ); - m_rController.getUndoMgr()->EnterListAction( sUndoAction, String() ); + String sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) ); + UndoManagerListAction aListAction(*m_rController.getUndoMgr(),sUndoAction); try { sal_Int32 j(0), i(0);; @@ -513,7 +517,6 @@ DBG_UNHANDLED_EXCEPTION(); nRet = RET_NO; } - m_rController.getUndoMgr()->LeaveListAction(); } return nRet; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
