Kaydet (Commit) d34f669f authored tarafından Thorsten Behrens's avatar Thorsten Behrens Kaydeden (comit) Noel Grandin

oox: kill redundant breaks

Change-Id: I18aadb7b6b2fa50159624df1b4a7de9270473785
Reviewed-on: https://gerrit.libreoffice.org/41480Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 290d7a4e
...@@ -40,7 +40,6 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken ...@@ -40,7 +40,6 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken
break; break;
case XML_grpSpPr: case XML_grpSpPr:
return new oox::drawingml::ShapePropertiesContext(*this, *mpShape); return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
break;
case XML_wsp: case XML_wsp:
{ {
// Don't set default character height, Writer has its own way to set // 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 ...@@ -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)); oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.CustomShape", /*bDefaultHeight=*/false));
return new oox::drawingml::ShapeContext(*this, mpShape, pShape); return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
} }
break;
case XML_pic: case XML_pic:
return new oox::drawingml::GraphicShapeContext(*this, mpShape, std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GraphicObjectShape")); return new oox::drawingml::GraphicShapeContext(*this, mpShape, std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GraphicObjectShape"));
break;
case XML_grpSp: case XML_grpSp:
{ {
return new oox::drawingml::ShapeGroupContext(*this, mpShape, std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GroupShape")); return new oox::drawingml::ShapeGroupContext(*this, mpShape, std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.GroupShape"));
} }
break;
case XML_graphicFrame: case XML_graphicFrame:
break; break;
default: default:
......
...@@ -55,10 +55,8 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken ...@@ -55,10 +55,8 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
break; break;
case XML_spPr: case XML_spPr:
return new oox::drawingml::ShapePropertiesContext(*this, *mpShape); return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
break;
case XML_style: case XML_style:
return new oox::drawingml::ShapeStyleContext(*this, *mpShape); return new oox::drawingml::ShapeStyleContext(*this, *mpShape);
break;
case XML_bodyPr: case XML_bodyPr:
if (mxShape.is()) if (mxShape.is())
{ {
......
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