Tag: cws_dev300_rptchart02 User: oj Date: 2008-05-07 06:56:35+0000 Modified: dba/reportdesign/source/ui/report/propbrw.cxx dba/reportdesign/source/ui/report/ReportController.cxx dba/reportdesign/source/core/sdr/RptObject.cxx
Log: #i88842# set databaseprovider at chart 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.6&r2=1.6.2.1 Delta lines: +12 -12 --------------------- --- propbrw.cxx 2008-04-10 19:18:22+0000 1.6 +++ propbrw.cxx 2008-05-07 06:56:32+0000 1.6.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: propbrw.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.2.1 $ * * This file is part of OpenOffice.org. * @@ -354,20 +354,20 @@ { if ( m_xBrowserController.is() ) { + try + { m_xBrowserController->inspect(uno::Sequence< Reference<uno::XInterface> >()); m_xBrowserController->inspect(_aObjects); if ( m_sLastActivePage.getLength() ) { - try - { m_xBrowserController->restoreViewData( makeAny( m_sLastActivePage ) ); + } // if ( m_sLastActivePage.getLength() ) } catch( const Exception& ) { OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); } - } //Resize(); } File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.12.4.4&r2=1.12.4.5 Delta lines: +8 -2 ------------------- --- ReportController.cxx 2008-04-29 12:53:53+0000 1.12.4.4 +++ ReportController.cxx 2008-05-07 06:56:32+0000 1.12.4.5 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportController.cxx,v $ - * $Revision: 1.12.4.4 $ + * $Revision: 1.12.4.5 $ * * This file is part of OpenOffice.org. * @@ -2922,8 +2922,14 @@ else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId ) { pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pReportSection->getPage(),m_aReportModel.get() ); + + pNewControl->SetLogicRect(Rectangle(3000,500,8000,5500)); // switch height and width xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY_THROW); - xShapeProp->setSize(awt::Size(5000,5000)); // switch height and width + OOle2Obj* pObj = dynamic_cast<OOle2Obj*>(pNewControl); + if ( pObj && !pObj->IsEmpty() ) + { + pObj->initializeChart(getModel()); + } } else { Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: RptObject.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/RptObject.cxx?r1=1.7.4.4&r2=1.7.4.5 Delta lines: +2 -3 ------------------- --- RptObject.cxx 2008-04-30 13:03:34+0000 1.7.4.4 +++ RptObject.cxx 2008-05-07 06:56:32+0000 1.7.4.5 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RptObject.cxx,v $ - * $Revision: 1.7.4.4 $ + * $Revision: 1.7.4.5 $ * * This file is part of OpenOffice.org. * @@ -297,10 +297,9 @@ DBG_CHKTHIS( rpt_OObjectBase,NULL); OSL_ENSURE(!m_xReportComponent.is() || isListening(), "OUnoObject::EndListening: not listening currently!"); + m_bIsListening = sal_False; if ( isListening() && m_xReportComponent.is() ) { - m_bIsListening = sal_False; - // XPropertyChangeListener if ( m_xPropertyChangeListener.is() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
