diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 06:32:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 06:32:56 +0000 |
| commit | 17699022c53ae0239f72c41a3ccb15c9bf92ef49 (patch) | |
| tree | 1a503e04fdf2415ff425d833601895302ef50914 /embeddedobj | |
| parent | 57ef4af12f0ca562ec43894190fdd2a467a87ad0 (diff) | |
INTEGRATION: CWS fwk59 (1.10.22); FILE MERGED
2007/01/04 16:05:11 mav 1.10.22.1: #i71349# introduce a better workaround for AcrobatReader 7.0.8 object
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/graphconvert.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index 22b85da70ec9..c26ac2cd41ab 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -4,9 +4,9 @@ * * $RCSfile: graphconvert.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2006-10-13 11:30:34 $ + * last change: $Author: obo $ $Date: 2007-01-23 07:32:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -111,9 +111,10 @@ sal_Bool ConvertBufferToFormat( void* pBuf, // MainThreadNotificationRequest // ===================================================================== -MainThreadNotificationRequest::MainThreadNotificationRequest( OleEmbeddedObject* pObj, sal_uInt32 nAspect ) -: m_pObject( pObj ) -, m_xObject( static_cast< embed::XEmbeddedObject* >( pObj ) ) +MainThreadNotificationRequest::MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect ) +: m_pObject( xObj.get() ) +, m_xObject( static_cast< embed::XEmbeddedObject* >( xObj.get() ) ) +, m_nNotificationType( nNotificationType ) , m_nAspect( nAspect ) {} @@ -141,7 +142,9 @@ IMPL_STATIC_LINK_NOINSTANCE( MainThreadNotificationRequest, worker, MainThreadNo { // this is the main thread, the solar mutex must be locked ::vos::OGuard aGuard( Application::GetSolarMutex() ); - if ( pMTRequest->m_nAspect == embed::Aspects::MSOLE_CONTENT ) + if ( pMTRequest->m_nNotificationType == OLECOMP_ONCLOSE ) + pMTRequest->m_pObject->OnClosed_Impl(); + else if ( pMTRequest->m_nAspect == embed::Aspects::MSOLE_CONTENT ) pMTRequest->m_pObject->OnViewChanged_Impl(); else if ( pMTRequest->m_nAspect == embed::Aspects::MSOLE_ICON ) pMTRequest->m_pObject->OnIconChanged_Impl(); |