GetSvxShape does the same checks, so use it directly

and drop the worthless unused xShapeTunnel Change-Id: Id9875691e8a01a11a84b0dd08a53fdee517924f4

GetSvxShape does the same checks, so use it directly
and drop the worthless unused xShapeTunnel Change-Id: Id9875691e8a01a11a84b0dd08a53fdee517924f4
e5982157 · Caolán McNamara · 7b0aed61 · e5982157
Kaydet (Commit) e5982157 authored Eyl 28, 2016 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

unodraw.cxx sw/source/core/unocore/unodraw.cxx +2 -7

No files found.
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2207,13 +2207,8 @@ 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())
-    {
-        uno::Reference< lang::XUnoTunnel > xShapeTunnel(xShapeAgg, uno::UNO_QUERY);
-        SvxShape* pSvxShape = GetSvxShape();
-        if(pSvxShape)
-            aSeq = pSvxShape->getSupportedServiceNames();
-    }
+    if (SvxShape* pSvxShape = GetSvxShape())
+        aSeq = pSvxShape->getSupportedServiceNames();
    aSeq.realloc(aSeq.getLength() + 1);
    aSeq.getArray()[aSeq.getLength() - 1] = "com.sun.star.drawing.Shape";
    return aSeq;