Tag: cws_src680_swrefactor071015 User: ama Date: 2008-08-29 11:21:05+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx
Log: Resync conflivt solved 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.6.4&r2=1.10.6.5 Delta lines: +4 -4 ------------------- --- ReportController.cxx 2008-08-28 15:04:51+0000 1.10.6.4 +++ ReportController.cxx 2008-08-29 11:21:03+0000 1.10.6.5 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportController.cxx,v $ - * $Revision: 1.10.6.4 $ + * $Revision: 1.10.6.5 $ * * This file is part of OpenOffice.org. * @@ -2936,7 +2936,7 @@ { SdrUnoObj* pLabel( NULL ); SdrUnoObj* pControl( NULL ); - FmFormView::createControlLabelPair(NULL,m_pMyOwnView + FmFormView::createControlLabelPair(m_pMyOwnView ,nLeftMargin,0 ,NULL,NULL,_nObjectId,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, NULL,pSectionWindow->getReportSection().getPage(),m_aReportModel.get(), @@ -3223,7 +3223,7 @@ pSectionViews[0] = &pSectionWindow[1]->getReportSection().getSectionView(); pSectionViews[1] = &pSectionWindow[0]->getReportSection().getSectionView(); // find this in svx - FmFormView::createControlLabelPair(pSectionViews[0],m_pMyOwnView + FmFormView::createControlLabelPair(m_pMyOwnView ,nLeftMargin,0 ,xField,xNumberFormats,nOBJID,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, pSectionWindow[1]->getReportSection().getPage(),pSectionWindow[0]->getReportSection().getPage(),m_aReportModel.get(), --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
