[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - embeddedobj/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Feb 10 09:14:20 UTC 2021
embeddedobj/source/msole/oleembed.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit b38f2625ef48d85ece632a951dca8db6df407049
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 2 12:58:47 2021 +0000
Commit: Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Feb 10 10:13:55 2021 +0100
tdf#140079 Claim support for the OleEmbeddedObject::doVerb -9 fallback
So in SfxViewFrame::GetState_Impl in case SID_OBJECT hasVerbs is not
empty, so that the doVerb attempt with -9 fallback is attempted
Change-Id: If32c50fedbc2a269ac277061c76a63514d320bb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110299
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
(cherry picked from commit 01f2379603de09ba1b5e979166e4b5d60a90c1d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110570
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 5997fba7ca22..608692c62083 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -1001,7 +1001,12 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV
else
#endif
{
- return uno::Sequence< embed::VerbDescriptor >();
+ // tdf#140079 Claim support for the OleEmbeddedObject::doVerb -9 fallback.
+ // So in SfxViewFrame::GetState_Impl in case SID_OBJECT hasVerbs is not
+ // empty, so that the doVerb attempt with -9 fallback is attempted
+ uno::Sequence<embed::VerbDescriptor> aRet(1);
+ aRet[0].VerbID = -9;
+ return aRet;
}
}
More information about the Libreoffice-commits
mailing list