diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-13 14:24:36 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-01-14 13:47:55 +0000 |
| commit | 6c1924d98974b93195bb7a4afd0a032bcaa990d0 (patch) | |
| tree | 2cc22659b63828074d4b569c0a5e3e453c79861f | |
| parent | 722a932a8a1b6aec2a0b47607f4a9db47e596b90 (diff) | |
fdo#73436 Let SdXImpressDocument handle css.drawing.* requests directly
...instead of handing off to base class, so that potential wrapping in SdXShape
(in create) is not skipped.
Change-Id: I57fb10ef478688a5a0c1c3c736efbd55a7172423
(cherry picked from commit a675873cb2bad78a5da3e3b089bebf01ca60f898)
Reviewed-on: https://gerrit.libreoffice.org/7405
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 9d2a01109349..7b0986933c14 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1096,7 +1096,9 @@ SdXImpressDocument::createInstanceWithArguments( throw (css::uno::Exception, css::uno::RuntimeException) { OUString arg; - if (ServiceSpecifier == "com.sun.star.presentation.MediaShape" + if ((ServiceSpecifier == "com.sun.star.drawing.GraphicObjectShape" + || ServiceSpecifier == "com.sun.star.drawing.MediaShape" + || ServiceSpecifier == "com.sun.star.presentation.MediaShape") && Arguments.getLength() == 1 && (Arguments[0] >>= arg)) { return create(ServiceSpecifier, arg); |