User: kz Date: 2008-03-05 18:14:41+0000 Modified: dba/reportdesign/source/ui/report/propbrw.cxx
Log: INTEGRATION: CWS rptchart01_DEV300 (1.4.16); FILE MERGED 2008/02/20 11:19:37 oj 1.4.16.1: #i85225# execute report is now always enabled, but with error message 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.4&r2=1.5 Delta lines: +17 -24 --------------------- --- propbrw.cxx 2008-01-29 13:52:46+0000 1.4 +++ propbrw.cxx 2008-03-05 18:14:38+0000 1.5 @@ -317,7 +317,11 @@ DBG_DTOR( rpt_PropBrw,NULL); } - +// ----------------------------------------------------------------------------- +void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage) +{ + m_sLastActivePage = _sLastActivePage; +} //---------------------------------------------------------------------------- void PropBrw::implDetachController() @@ -424,6 +428,18 @@ m_xBrowserController->inspect(uno::Sequence< Reference<uno::XInterface> >()); m_xBrowserController->inspect(_aObjects); + if ( m_sLastActivePage.getLength() ) + { + try + { + m_xBrowserController->restoreViewData( makeAny( m_sLastActivePage ) ); + } + catch( const Exception& ) + { + OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); + } + } + //Resize(); } SetText( GetHeadlineName(_aObjects) ); @@ -618,29 +634,6 @@ } } - // if ( nMarkCount == 1 ) - // { - // m_xLastSection.clear(); - // SdrObject* pDlgEdObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - // OObjectBase* pObj = dynamic_cast<OObjectBase*>(pDlgEdObj); - // if ( pObj ) - // { - // if ( pDlgEdObj && pDlgEdObj->IsGroupObject() ) - // { - // implSetNewObject( CreateCompPropSet( rMarkList ) ); - // } - // else // single selection - // { - // uno::Reference< uno::XInterface > xTemp = CreateComponentPair(pObj); - // implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); - // } - // } - // else - // { - // implSetNewObject( ); - // } - //} - // else if ( aMarkedObjects.getLength() ) // multiple selection { m_xLastSection.clear(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
