User: hr Date: 2007-08-03 09:53:41+0000 Modified: dba/reportdesign/source/core/api/ReportDefinition.cxx
Log: INTEGRATION: CWS rpt23fix02 (1.2.4); FILE MERGED 2007/07/31 12:33:12 oj 1.2.4.4: #i77349# set caption 2007/07/31 09:49:38 lla 1.2.4.3: #i80211# solarmutex need locked 2007/07/27 12:21:57 oj 1.2.4.2: #i77907# remove entries from context when propbrw is destroyed 2007/07/24 12:48:02 oj 1.2.4.1: merge from rpt23fix01 File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportDefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportDefinition.cxx?r1=1.3&r2=1.4 Delta lines: +8 -20 -------------------- --- ReportDefinition.cxx 2007-08-02 14:30:16+0000 1.3 +++ ReportDefinition.cxx 2007-08-03 09:53:39+0000 1.4 @@ -637,7 +637,6 @@ uno::Reference< report::XSection> m_xDetail; uno::Reference< embed::XStorage > m_xStorage; uno::Reference< frame::XController > m_xCurrentController; - uno::Reference< document::XEventListener > m_xDocEventBroadcaster; uno::Reference< container::XIndexAccess > m_xViewData; uno::Reference< container::XNameAccess > m_xStyles; uno::Reference< report::XFunctions > m_xFunctions; @@ -785,13 +784,11 @@ SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin(); rAdmin.NewStandardLayer(); rAdmin.NewLayer( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ) ); - m_pImpl->m_xDocEventBroadcaster.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster")),m_aProps->m_xContext), - uno::UNO_QUERY); m_pImpl->m_xFunctions = new OFunctions(this,m_aProps->m_xContext); } catch(uno::Exception) { - OSL_ENSURE(0,"Could not create GlobalEventBroadcaster!"); + OSL_ENSURE(0,"Error!"); } } // ----------------------------------------------------------------------------- @@ -815,8 +812,6 @@ m_pImpl->m_aDocEventListeners.disposeAndClear( aDisposeEvent ); m_pImpl->m_aStorageChangeListeners.disposeAndClear( aDisposeEvent ); - m_pImpl->m_xDocEventBroadcaster.clear(); - ::comphelper::disposeComponent(m_pImpl->m_xGroups); ::comphelper::disposeComponent(m_pImpl->m_xReportHeader); ::comphelper::disposeComponent(m_pImpl->m_xReportFooter); @@ -836,6 +831,7 @@ m_pImpl->m_xStyles.clear(); m_pImpl->m_xUIConfigurationManager.clear(); m_pImpl->m_pReportModel.reset(); + m_pImpl->m_aArgs.realloc(0); } } // ----------------------------------------------------------------------------- @@ -1345,6 +1341,8 @@ // XCloseable void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (util::CloseVetoException, uno::RuntimeException) { + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::osl::ResettableMutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); // notify our container listeners @@ -1413,6 +1411,9 @@ ); } lcl_stripLoadArguments( _aDescriptor, m_pImpl->m_aArgs ); + ::rtl::OUString sCaption; + sCaption = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")),sCaption); + setCaption(sCaption); } // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OReportDefinition::getURL( ) throw (uno::RuntimeException) @@ -1886,20 +1887,7 @@ ::osl::ResettableMutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); document::EventObject aEvt(*this, _sEventName); - /// TODO: this code has to be deleted after as cws will be integrated - uno::Reference< document::XEventListener > xDocEventBroadcaster; - try - { - xDocEventBroadcaster.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster")),m_aProps->m_xContext), - uno::UNO_QUERY); - } - catch(uno::Exception) - { - OSL_ENSURE(0,"Could not create GlobalEventBroadcaster!"); - } aGuard.clear(); - if ( xDocEventBroadcaster.is() ) - xDocEventBroadcaster->notifyEvent(aEvt); m_pImpl->m_aDocEventListeners.notifyEach(&document::XEventListener::notifyEvent,aEvt); } catch(uno::Exception&) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
