summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-13 14:24:36 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-13 14:28:21 +0100
commitcf0834724fa54c3fd718029505cc2865a3dd0149 (patch)
treeb88fd3d67c31fb329eab554bdabfcc79a7f45631
parentea86296ffc9cc60ccd5efbe215e9ad605c0181e6 (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)
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
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);