[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sd/source

[Stephan Bergmann]

 sd/source/ui/unoidl/unomodel.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6c1924d98974b93195bb7a4afd0a032bcaa990d0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 13 14:24:36 2014 +0100

    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 at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 9d2a011..7b09869 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);