Tag: cws_src680_swrefactor071015 User: fs Date: 2008-03-19 11:03:12+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx
Log: during #i87241#: some refactoring of the FmFormView 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.10&r2=1.10.6.1 Delta lines: +12 -15 --------------------- --- ReportController.cxx 2008-02-12 13:19:31+0000 1.10 +++ ReportController.cxx 2008-03-19 11:03:09+0000 1.10.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.6.1 $ * - * last change: $Author: vg $ $Date: 2008/02/12 13:19:31 $ + * last change: $Author: fs $ $Date: 2008/03/19 11:03:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3163,13 +3163,11 @@ } else { - SdrUnoObj* pLabel,*pControl; - FmFormView::createControlLabelPair(NULL,m_pMyOwnView - ,nLeftMargin,0 - ,NULL,NULL,_nObjectId,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, - NULL,pReportSection->getPage(),m_aReportModel.get(), - pLabel,pControl); - + SdrUnoObj* pLabel( NULL ); + SdrUnoObj* pControl( NULL ); + FmFormView::createControlLabelPair( m_pMyOwnView, nLeftMargin, 0, + NULL, NULL, _nObjectId, ::rtl::OUString(), ReportInventor, OBJ_DLG_FIXEDTEXT, + NULL, pReportSection->getPage(), m_aReportModel.get(), pLabel, pControl ); delete pLabel; pNewControl = pControl; @@ -3450,11 +3448,10 @@ pSectionViews[0] = pReportSection[1]->getView(); pSectionViews[1] = pReportSection[0]->getView(); // find this in svx - FmFormView::createControlLabelPair(pSectionViews[0],m_pMyOwnView - ,nLeftMargin,0 - ,xField,xNumberFormats,nOBJID,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, - pReportSection[1]->getPage(),pReportSection[0]->getPage(),m_aReportModel.get(), - pControl[0],pControl[1]); + FmFormView::createControlLabelPair( m_pMyOwnView, nLeftMargin, 0, + xField, xNumberFormats, nOBJID, ::rtl::OUString(), ReportInventor, OBJ_DLG_FIXEDTEXT, + pReportSection[1]->getPage(), pReportSection[0]->getPage(), m_aReportModel.get(), + pControl[0], pControl[1] ); //m_pMyOwnView->GetModel()->GetUndoEnv().UnLock(); if ( pControl[0] && pControl[1] ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
