Tag: cws_src680_reportdesign01 User: oj Date: 2007-10-23 11:00:44+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx
Log: #i77604# correct order of section 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.4.20.5&r2=1.4.20.6 Delta lines: +16 -13 --------------------- --- ReportController.cxx 2007-10-16 11:55:19+0000 1.4.20.5 +++ ReportController.cxx 2007-10-23 11:00:41+0000 1.4.20.6 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.4.20.5 $ + * $Revision: 1.4.20.6 $ * - * last change: $Author: oj $ $Date: 2007/10/16 11:55:19 $ + * last change: $Author: oj $ $Date: 2007/10/23 11:00:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1690,7 +1690,7 @@ } break; case SID_SAVEASDOC: - getView()->PostUserEvent(LINK(this, OReportController,OnSaveAs)); + //getView()->PostUserEvent(LINK(this, OReportController,OnSaveAs)); break; case SID_SAVEDOC: getView()->PostUserEvent(LINK(this, OReportController,OnSave)); @@ -3779,19 +3779,22 @@ } // for (sal_Int32 i=0;i<nCount ; ++i) if ( _bAdd ) + { m_pMyOwnView->addSection(m_xReportDefinition->getDetail(),DBDETAIL); - for (sal_Int32 i=0;i<nCount ; ++i) + for (sal_Int32 i=nCount;i > 0 ; --i) { - uno::Reference< report::XGroup > xGroup(xGroups->getByIndex(i),uno::UNO_QUERY); - if ( xGroup->getFooterOn() && _bAdd ) + uno::Reference< report::XGroup > xGroup(xGroups->getByIndex(i-1),uno::UNO_QUERY); + if ( xGroup->getFooterOn() ) m_pMyOwnView->addSection(xGroup->getFooter(),DBGROUPFOOTER); - } // for (sal_Int32 i=0;i<nCount ; ++i) - - if ( m_xReportDefinition->getReportFooterOn() && _bAdd ) + } + if ( m_xReportDefinition->getReportFooterOn() ) m_pMyOwnView->addSection(m_xReportDefinition->getReportFooter(),DBREPORTFOOTER); - if ( m_xReportDefinition->getPageFooterOn() && _bAdd ) + if ( m_xReportDefinition->getPageFooterOn()) m_pMyOwnView->addSection(m_xReportDefinition->getPageFooter(),DBPAGEFOOTER); + } + + _bAdd ? xGroups->addContainerListener(static_cast<XContainerListener*>(this)) : xGroups->removeContainerListener(static_cast<XContainerListener*>(this)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
