diff options
| author | Guillaume Smaha <guillaume.smaha@gmail.com> | 2016-05-18 09:33:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-24 07:03:45 +0000 |
| commit | 2986e54412bbaf95ef768b9ffc18c9a465678337 (patch) | |
| tree | 2b9809b9180927a7eae749184fc403d2cc009f32 /sfx2/source | |
| parent | 3650eacc9e4bf230d892eaac9366b7ebc16ed5c1 (diff) | |
Fix tdf#99506: Insert OLE object with icon failed
Change-Id: I7fe5814b268e4c70977699edaa89926ca3fda92e
Reviewed-on: https://gerrit.libreoffice.org/25080
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 6b7f0adf0e01..1f2b56b56eb2 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/embed/XWindowSupplier.hpp> #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/EmbedVerbs.hpp> +#include <com/sun/star/embed/XEmbeddedOleObject.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -911,7 +912,13 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb ) { if ( m_pImp->m_nAspect == embed::Aspects::MSOLE_ICON ) { - if ( nVerb == embed::EmbedVerbs::MS_OLEVERB_PRIMARY || nVerb == embed::EmbedVerbs::MS_OLEVERB_SHOW ) + // the common persistence is supported by objects and links + + uno::Reference< embed::XEmbeddedOleObject > xEmbeddedOleObject( m_pImp->m_xObject, uno::UNO_QUERY ); + + if ( xEmbeddedOleObject.is() && (nVerb == embed::EmbedVerbs::MS_OLEVERB_PRIMARY || nVerb == embed::EmbedVerbs::MS_OLEVERB_OPEN || nVerb == embed::EmbedVerbs::MS_OLEVERB_SHOW )) + nVerb = embed::EmbedVerbs::MS_OLEVERB_SHOW; + else if ( nVerb == embed::EmbedVerbs::MS_OLEVERB_PRIMARY || nVerb == embed::EmbedVerbs::MS_OLEVERB_SHOW ) nVerb = embed::EmbedVerbs::MS_OLEVERB_OPEN; // outplace activation else if ( nVerb == embed::EmbedVerbs::MS_OLEVERB_UIACTIVATE || nVerb == embed::EmbedVerbs::MS_OLEVERB_IPACTIVATE ) |