[Libreoffice-commits] core.git: sw/source

[Samuel Mehrbrodt]

 sw/source/filter/ww8/docxsdrexport.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 8f88161bbd043208480ef01278ceaae38599725a
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Nov 23 15:50:34 2017 +0100

    Simplify method
    
    Change-Id: I4de0c0fc0127b454f19ecf154d8ce58f189852cf
    Reviewed-on: https://gerrit.libreoffice.org/45164
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 8b33ea440ca9..df9372855cfc 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -919,13 +919,12 @@ void DocxSdrExport::Impl::textFrameShadow(const SwFrameFormat& rFrameFormat)
 
 bool DocxSdrExport::Impl::isSupportedDMLShape(const uno::Reference<drawing::XShape>& xShape)
 {
-    bool supported = true;
-
     uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY_THROW);
-    if (xServiceInfo->supportsService("com.sun.star.drawing.PolyPolygonShape") || xServiceInfo->supportsService("com.sun.star.drawing.PolyLineShape"))
-        supported = false;
+    if (xServiceInfo->supportsService("com.sun.star.drawing.PolyPolygonShape")
+        || xServiceInfo->supportsService("com.sun.star.drawing.PolyLineShape"))
+        return false;
 
-    return supported;
+    return true;
 }
 
 void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat, int nAnchorId)