Tag: cws_src680_rptchart01 User: oj Date: 2008-02-20 11:25:59+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx
Log: #i85225# execute report is now always enabled, but with error message File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.6.16.6&r2=1.6.16.7 Delta lines: +21 -9 -------------------- --- ReportController.cxx 2008-02-20 11:19:37+0000 1.6.16.6 +++ ReportController.cxx 2008-02-20 11:25:56+0000 1.6.16.7 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.6.16.6 $ + * $Revision: 1.6.16.7 $ * - * last change: $Author: oj $ $Date: 2008/02/20 11:19:37 $ + * last change: $Author: oj $ $Date: 2008/02/20 11:25:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2945,15 +2945,27 @@ String sInfo = String( ModuleRes( nErrorId ) ); aFirstMessage.Message = sInfo; aInfo = aFirstMessage; - if ( isEditable() && nErrorId == RID_ERR_NO_COMMAND ) + if ( isEditable() ) + { + sal_uInt16 nCommand = 0; + if ( nErrorId == RID_ERR_NO_COMMAND ) { if ( !m_bShowProperties ) executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); m_sLastActivePage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")); m_pMyOwnView->setCurrentPage(m_sLastActivePage); + nCommand = SID_SELECT_REPORT; + } + else if ( m_pMyOwnView && !m_pMyOwnView->isAddFieldVisible() ) + { + nCommand = SID_FM_ADD_FIELD; + } + if ( nCommand ) + { uno::Sequence< beans::PropertyValue> aArgs; - executeUnChecked(SID_SELECT_REPORT,aArgs); + executeUnChecked(nCommand,aArgs); + } } } else --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
