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

Thorsten Behrens Thorsten.Behrens at CIB.de
Thu Aug 24 06:05:34 UTC 2017


 oox/source/shape/WpgContext.cxx |    4 ----
 oox/source/shape/WpsContext.cxx |    2 --
 2 files changed, 6 deletions(-)

New commits:
commit d34f669fc4a598c9a3967aac5b008336609c852b
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue Aug 1 03:07:17 2017 +0200

    oox: kill redundant breaks
    
    Change-Id: I18aadb7b6b2fa50159624df1b4a7de9270473785
    Reviewed-on: https://gerrit.libreoffice.org/41480
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index ead163738d74..c709fe314475 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -40,7 +40,6 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken
         break;
     case XML_grpSpPr:
         return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
-        break;
     case XML_wsp:
     {
         // Don't set default character height, Writer has its own way to set
@@ -49,15 +48,12 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken
         oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.CustomShape", /*bDefaultHeight=*/false));
         return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
     }
-    break;
     case XML_pic:
         return new oox::drawingml::GraphicShapeContext(*this, mpShape, std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GraphicObjectShape"));
-        break;
     case XML_grpSp:
     {
         return new oox::drawingml::ShapeGroupContext(*this, mpShape, std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GroupShape"));
     }
-    break;
     case XML_graphicFrame:
         break;
     default:
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 23e9af6fb8f2..341fa8efb43a 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -55,10 +55,8 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
         break;
     case XML_spPr:
         return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
-        break;
     case XML_style:
         return new oox::drawingml::ShapeStyleContext(*this, *mpShape);
-        break;
     case XML_bodyPr:
         if (mxShape.is())
         {


More information about the Libreoffice-commits mailing list