diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-21 07:33:43 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-21 07:33:43 +0000 |
| commit | b21e7d5cc8df7e5f0f2b454653f1163a43859c18 (patch) | |
| tree | 7a5ae891b4d9dad4934a2cfb391c84cd4b07f12e /sfx2 | |
| parent | a45c940dce16f424c4217bb68ec3501aa075062d (diff) | |
INTEGRATION: CWS late241bf01_DEV300 (1.131.26.4.18); FILE MERGED
2008/05/16 12:58:52 mba 1.131.26.4.18.2: #157928#: forward PrintJobListeners to PrintingHelper
2008/05/16 12:57:09 mba 1.131.26.4.18.1: #157928#: forward PrintJobListeners to PrintingHelper
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 05cc674246..e6cc92940d 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sfxbasemodel.cxx,v $ - * $Revision: 1.142 $ + * $Revision: 1.143 $ * * This file is part of OpenOffice.org. * @@ -421,7 +421,7 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell ) , m_pData( new IMPL_SfxBaseModel_DataContainer( m_aMutex, pObjectShell ) ) , m_bSupportEmbeddedScripts( pObjectShell && pObjectShell->pImp ? !pObjectShell->pImp->m_bNoBasicCapabilities : false ) { - DBG_CTOR(sfx2_SfxBaseModel,NULL); + DBG_CTOR(sfx2_SfxBaseModel,NULL); if ( pObjectShell != NULL ) { StartListening( *pObjectShell ) ; @@ -434,7 +434,7 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell ) SfxBaseModel::~SfxBaseModel() { - DBG_DTOR(sfx2_SfxBaseModel,NULL); + DBG_DTOR(sfx2_SfxBaseModel,NULL); } //________________________________________________________________________________________________________ @@ -696,8 +696,8 @@ void SAL_CALL SfxBaseModel::dispose() throw(::com::sun::star::uno::RuntimeExcept m_pData->m_xCurrent = uno::Reference< frame::XController > (); m_pData->m_seqControllers = uno::Sequence< uno::Reference< frame::XController > > () ; - // m_pData member must be set to zero before 0delete is called to - // force disposed exception whenever someone tries to access our + // m_pData member must be set to zero before 0delete is called to + // force disposed exception whenever someone tries to access our // instance while in the dtor. IMPL_SfxBaseModel_DataContainer* pData = m_pData; m_pData = 0; @@ -1690,7 +1690,7 @@ void SAL_CALL SfxBaseModel::load( const uno::Sequence< beans::PropertyValue >& // SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, sal_False); // sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); - // + // // does already happen in DoLoad call //m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC ); @@ -2842,7 +2842,14 @@ void SAL_CALL SfxBaseModel::addPrintJobListener( const uno::Reference< view::XPr if ( impl_isDisposed() ) return; - m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener ); + if ( impl_getPrintHelper() ) + { + uno::Reference < view::XPrintJobBroadcaster > xPJB( m_pData->m_xPrintable, uno::UNO_QUERY ); + if ( xPJB.is() ) + xPJB->addPrintJobListener( xListener ); + } +// else +// m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener ); } void SAL_CALL SfxBaseModel::removePrintJobListener( const uno::Reference< view::XPrintJobListener >& xListener ) throw (uno::RuntimeException) @@ -2852,7 +2859,14 @@ void SAL_CALL SfxBaseModel::removePrintJobListener( const uno::Reference< view:: if ( impl_isDisposed() ) return; - m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener ); + if ( impl_getPrintHelper() ) + { + uno::Reference < view::XPrintJobBroadcaster > xPJB( m_pData->m_xPrintable, uno::UNO_QUERY ); + if ( xPJB.is() ) + xPJB->removePrintJobListener( xListener ); + } +// else +// m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener ); } // simple declaration of class SvObject is enough |