User: vg Date: 2008-08-19 10:19:19+0000 Modified: dba/reportdesign/source/ui/report/propbrw.cxx
Log: INTEGRATION: CWS dba31a (1.6.30); FILE MERGED 2008/06/26 14:26:35 oj 1.6.30.3: #i77916# impl zooming in report builder 2008/06/24 12:07:52 oj 1.6.30.2: RESYNC: (1.6-1.7); FILE MERGED 2008/06/13 11:40:21 oj 1.6.30.1: #i88506# impl hyphenation File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: propbrw.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/propbrw.cxx?r1=1.8&r2=1.9 Delta lines: +6 -6 ------------------- --- propbrw.cxx 2008-06-25 11:38:31+0000 1.8 +++ propbrw.cxx 2008-08-19 10:19:16+0000 1.9 @@ -551,14 +551,14 @@ m_pView = pNewView; uno::Sequence< Reference<uno::XInterface> > aMarkedObjects; - OViewsWindow* pViews = m_pView->getSectionWindow()->getViewsWindow(); + OViewsWindow* pViews = m_pView->getReportSection()->getSectionWindow()->getViewsWindow(); const USHORT nSectionCount = pViews->getSectionCount(); for (USHORT i = 0; i < nSectionCount; ++i) { - ::boost::shared_ptr<OReportSection> pReportSection = pViews->getSection(i); - if ( pReportSection ) + ::boost::shared_ptr<OSectionWindow> pSectionWindow = pViews->getSectionWindow(i); + if ( pSectionWindow ) { - const SdrMarkList& rMarkList = pReportSection->getView()->GetMarkedObjectList(); + const SdrMarkList& rMarkList = pSectionWindow->getReportSection().getSectionView().GetMarkedObjectList(); aMarkedObjects = ::comphelper::concatSequences(aMarkedObjects,CreateCompPropSet( rMarkList )); } } @@ -568,9 +568,9 @@ m_xLastSection.clear(); implSetNewObject( aMarkedObjects ); } - else if ( m_xLastSection != m_pView->getSectionWindow()->getSection() ) + else if ( m_xLastSection != m_pView->getReportSection()->getSection() ) { - uno::Reference< uno::XInterface> xTemp(m_pView->getSectionWindow()->getSection()); + uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection()); m_xLastSection = xTemp; uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent")),uno::makeAny(xTemp)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
