summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-19 09:19:16 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-19 09:19:16 +0000
commit712cf597f2f404c01a36473ca2a4cc84f78144fe (patch)
tree76caaf9ae912fea0b0a4a1f85ec565872f36bad6 /reportdesign
parentb966eb18ba6eafe297cf26821012a6efac286328 (diff)
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
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 6bfcf178727b..450eff5995a3 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: propbrw.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
* This file is part of OpenOffice.org.
*
@@ -551,14 +551,14 @@ void PropBrw::Update( OSectionView* pNewView )
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 @@ void PropBrw::Update( OSectionView* pNewView )
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));