User: rt Date: 2008-06-16 13:29:57+0000 Modified: dba/reportdesign/source/core/api/Section.cxx
Log: INTEGRATION: CWS rptchart02 (1.5.4); FILE MERGED 2008/06/10 12:50:49 oj 1.5.4.3: #i88579# compiler bugfix for solaris x86 2008/04/16 06:27:56 oj 1.5.4.2: RESYNC: (1.5-1.6); FILE MERGED 2008/03/12 09:45:16 oj 1.5.4.1: impl chart handling File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: Section.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/Section.cxx?r1=1.6&r2=1.7 Delta lines: +26 -9 -------------------- --- Section.cxx 2008-04-10 18:14:49+0000 1.6 +++ Section.cxx 2008-06-16 13:29:55+0000 1.7 @@ -174,6 +174,7 @@ { SectionPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); + } // ----------------------------------------------------------------------------- // TODO: VirtualFunctionFinder: This is virtual function! @@ -183,8 +184,9 @@ lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) ); m_aContainerListeners.disposeAndClear( aDisposeEvent ); m_xContext.clear(); + //m_xDrawPage.clear(); - uno::Reference< report::XReportDefinition> xReport = getReportDefinition(); + /*uno::Reference< report::XReportDefinition> xReport = getReportDefinition(); ::boost::shared_ptr<rptui::OReportModel> pModel = OReportDefinition::getSdrModel(xReport); osl_incrementInterlockedCount( &m_refCount ); while( m_xDrawPage.is() && m_xDrawPage->hasElements() ) @@ -203,7 +205,7 @@ uno::Reference< report::XSection> xSection = this; pModel->DeletePage(pModel->getPage(xSection)->GetPageNum()); } - osl_decrementInterlockedCount( &m_refCount ); + osl_decrementInterlockedCount( &m_refCount );*/ } //-------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeException) @@ -235,14 +237,29 @@ OSL_ENSURE(pModel,"No odel set at the report definition!"); if ( pModel ) { +// DO NOT TOUCH THIS BLOCKS, WE HAVE A COMPILER PROBLEM UNDER SOLARIS X86 osl_incrementInterlockedCount( &m_refCount ); { - m_xProxy.set(pModel->createNewPage(this)->getUnoPage(),uno::UNO_QUERY); + uno::Reference<report::XSection> xTemp = this; + { + { + m_xProxy.set(pModel->createNewPage(xTemp)->getUnoPage(),uno::UNO_QUERY); + } + { ::comphelper::query_aggregation(m_xProxy,m_xDrawPage); + } + // set ourself as delegator + { if ( m_xProxy.is() ) - m_xProxy->setDelegator( static_cast<cppu::OWeakObject*>(this) ); + { + m_xProxy->setDelegator( xTemp ); + } } + } + xTemp.clear(); + } +// DO NOT TOUCH THIS BLOCKS, WE HAVE A COMPILER PROBLEM UNDER SOLARIS X86 osl_decrementInterlockedCount( &m_refCount ); } } @@ -349,7 +366,6 @@ ,1 ,m_xContext); checkNotPageHeaderFooter(); - set(PROPERTY_FORCENEWPAGE,_forcenewpage,m_nForceNewPage); } // ----------------------------------------------------------------------------- @@ -385,6 +401,7 @@ ::osl::MutexGuard aGuard(m_aMutex); checkNotPageHeaderFooter(); } + set(PROPERTY_KEEPTOGETHER,_keeptogether,m_bKeepTogether); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
