Kaydet (Commit) 5345b156 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#102358 writer cannot save 3d shape inserted from draw

because SwXShape::supportsService always returned true for
com.sun.star.drawing.Shape I surmise that getSupportedServiceNames
should always list com.sun.star.drawing.Shape as a supported service

This went awry with...

commit 2f50ce6c
Author: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Date:   Thu Dec 5 19:17:18 2013 -0200

    fdo#54938: Convert sw to use cppu::supportsService

    Change-Id: Ic27bf31e5eb991ccceb8b97713d1e50a736709c8
Signed-off-by: 's avatarStephan Bergmann <sbergman@redhat.com>

Change-Id: I9821a620da8bac3b6b59da976a8c25bb2deafcf1
üst e4390585
......@@ -2207,18 +2207,15 @@ sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( uno::Run
uno::Sequence< OUString > SwXShape::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
{
uno::Sequence< OUString > aSeq;
if(xShapeAgg.is())
if (xShapeAgg.is())
{
uno::Reference< lang::XUnoTunnel > xShapeTunnel(xShapeAgg, uno::UNO_QUERY);
SvxShape* pSvxShape = GetSvxShape();
if(pSvxShape)
aSeq = pSvxShape->getSupportedServiceNames();
}
else
{
aSeq.realloc(1);
aSeq.getArray()[0] = "com.sun.star.drawing.Shape";
}
aSeq.realloc(aSeq.getLength() + 1);
aSeq.getArray()[aSeq.getLength() - 1] = "com.sun.star.drawing.Shape";
return aSeq;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment