diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-13 10:30:34 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-13 10:30:34 +0000 |
| commit | c433034656911afcc178a3faa345dd6d7f64d26e (patch) | |
| tree | c84785f84b9fb49081897629c8b189d2122c3146 /embeddedobj | |
| parent | cb90eca3d2835986a72d1a244f41aa52675ac1c0 (diff) | |
INTEGRATION: CWS opofxmlstorage (1.7.18); FILE MERGED
2006/05/23 15:11:14 mav 1.7.18.1: #122878# Iconified object replacement image must be handled by the container
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/graphconvert.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index 15f8a6697df9..22b85da70ec9 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -4,9 +4,9 @@ * * $RCSfile: graphconvert.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-10-12 11:22:03 $ + * last change: $Author: obo $ $Date: 2006-10-13 11:30:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,9 @@ #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> #endif +#ifndef _COM_SUN_STAR_EMBED_ASPECTS_HPP_ +#include <com/sun/star/embed/Aspects.hpp> +#endif #include "mtnotification.hxx" #include "oleembobj.hxx" @@ -108,9 +111,10 @@ sal_Bool ConvertBufferToFormat( void* pBuf, // MainThreadNotificationRequest // ===================================================================== -MainThreadNotificationRequest::MainThreadNotificationRequest( OleEmbeddedObject* pObj ) +MainThreadNotificationRequest::MainThreadNotificationRequest( OleEmbeddedObject* pObj, sal_uInt32 nAspect ) : m_pObject( pObj ) , m_xObject( static_cast< embed::XEmbeddedObject* >( pObj ) ) +, m_nAspect( nAspect ) {} void MainThreadNotificationRequest::mainThreadWorkerStart( MainThreadNotificationRequest* pMTRequest ) @@ -137,7 +141,10 @@ IMPL_STATIC_LINK_NOINSTANCE( MainThreadNotificationRequest, worker, MainThreadNo { // this is the main thread, the solar mutex must be locked ::vos::OGuard aGuard( Application::GetSolarMutex() ); - pMTRequest->m_pObject->OnViewChanged_Impl(); + 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(); } } catch( uno::Exception& ) |