sw/source/core/unocore/unodraw.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
New commits: commit 8da897574f0a9e40b87944750eec813c428e6a30 Author: Caolán McNamara <[email protected]> Date: Wed Sep 28 12:24:49 2016 +0100 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 2f50ce6cfab2871cd879c1429e1938d3642616ef Author: Marcos Paulo de Souza <[email protected]> Date: Thu Dec 5 19:17:18 2013 -0200 fdo#54938: Convert sw to use cppu::supportsService Change-Id: Ic27bf31e5eb991ccceb8b97713d1e50a736709c8 Signed-off-by: Stephan Bergmann <[email protected]> Change-Id: I9821a620da8bac3b6b59da976a8c25bb2deafcf1 (cherry picked from commit 5345b1562066d61b9ed79f072f8a953c67f847ed) Reviewed-on: https://gerrit.libreoffice.org/29360 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 1002402..47ebb0b 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -2245,18 +2245,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; }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
