Kaydet (Commit) 8ab3715d authored tarafından Julien Nabet's avatar Julien Nabet

Again Fix others Consecutive return, break

Change-Id: I67a453bb09b794c996f5f02a065abe8cef6ca3b6
üst 558aebe2
...@@ -167,16 +167,12 @@ sal_uInt16 LwpBorderStuff::GetSideType(sal_uInt16 side) ...@@ -167,16 +167,12 @@ sal_uInt16 LwpBorderStuff::GetSideType(sal_uInt16 side)
{ {
case LEFT: case LEFT:
return m_nBoderGroupIDLeft; return m_nBoderGroupIDLeft;
break;
case RIGHT: case RIGHT:
return m_nBoderGroupIDRight; return m_nBoderGroupIDRight;
break;
case TOP: case TOP:
return m_nBoderGroupIDTop; return m_nBoderGroupIDTop;
break;
case BOTTOM: case BOTTOM:
return m_nBoderGroupIDBottom; return m_nBoderGroupIDBottom;
break;
} }
// FIXME: this is needed to avoid warning: control reaches end of non-void function // FIXME: this is needed to avoid warning: control reaches end of non-void function
// a better solution would be to enum value for the parameter side // a better solution would be to enum value for the parameter side
...@@ -189,16 +185,12 @@ LwpColor LwpBorderStuff::GetSideColor(sal_uInt16 side) ...@@ -189,16 +185,12 @@ LwpColor LwpBorderStuff::GetSideColor(sal_uInt16 side)
{ {
case LEFT: case LEFT:
return m_aColorLeft; return m_aColorLeft;
break;
case RIGHT: case RIGHT:
return m_aColorRight; return m_aColorRight;
break;
case TOP: case TOP:
return m_aColorTop; return m_aColorTop;
break;
case BOTTOM: case BOTTOM:
return m_aColorBottom; return m_aColorBottom;
break;
} }
// FIXME: this is needed to avoid warning: control reaches end of non-void function // FIXME: this is needed to avoid warning: control reaches end of non-void function
// a better solution would be to enum value for the parameter side // a better solution would be to enum value for the parameter side
...@@ -211,16 +203,12 @@ float LwpBorderStuff::GetSideWidth(sal_uInt16 side) ...@@ -211,16 +203,12 @@ float LwpBorderStuff::GetSideWidth(sal_uInt16 side)
{ {
case LEFT: case LEFT:
return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthLeft)); return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthLeft));
break;
case RIGHT: case RIGHT:
return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthRight)); return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthRight));
break;
case TOP: case TOP:
return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthTop)); return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthTop));
break;
case BOTTOM: case BOTTOM:
return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthBottom)); return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthBottom));
break;
} }
// FIXME: this is needed to avoid warning: control reaches end of non-void function // FIXME: this is needed to avoid warning: control reaches end of non-void function
// a better solution would be to enum value for the parameter side // a better solution would be to enum value for the parameter side
......
...@@ -178,7 +178,6 @@ namespace oox { namespace ppt { ...@@ -178,7 +178,6 @@ namespace oox { namespace ppt {
// add a condition to the list // add a condition to the list
maConditions.push_back( AnimationCondition() ); maConditions.push_back( AnimationCondition() );
return new CondContext( *this, rAttribs.getFastAttributeList(), mpNode, maConditions.back() ); return new CondContext( *this, rAttribs.getFastAttributeList(), mpNode, maConditions.back() );
break;
default: default:
break; break;
} }
......
...@@ -66,7 +66,6 @@ ContextHandlerRef LayoutFragmentHandler::onCreateContext( sal_Int32 aElementToke ...@@ -66,7 +66,6 @@ ContextHandlerRef LayoutFragmentHandler::onCreateContext( sal_Int32 aElementToke
} }
case PPT_TOKEN( hf ): // CT_HeaderFooter case PPT_TOKEN( hf ): // CT_HeaderFooter
return new HeaderFooterContext( *this, rAttribs, mpSlidePersistPtr->getHeaderFooter() ); return new HeaderFooterContext( *this, rAttribs, mpSlidePersistPtr->getHeaderFooter() );
break;
default: default:
return SlideFragmentHandler::onCreateContext( aElementToken, rAttribs ); return SlideFragmentHandler::onCreateContext( aElementToken, rAttribs );
} }
......
...@@ -185,7 +185,6 @@ SlideFragmentHandler::~SlideFragmentHandler() throw() ...@@ -185,7 +185,6 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
return this; return this;
case PPT_TOKEN( txStyles ): // CT_SlideMasterTextStyles case PPT_TOKEN( txStyles ): // CT_SlideMasterTextStyles
return new SlideMasterTextStylesContext( *this, mpSlidePersistPtr ); return new SlideMasterTextStylesContext( *this, mpSlidePersistPtr );
break;
case PPT_TOKEN( custDataLst ): // CT_CustomerDataList case PPT_TOKEN( custDataLst ): // CT_CustomerDataList
case PPT_TOKEN( tagLst ): // CT_TagList case PPT_TOKEN( tagLst ): // CT_TagList
return this; return this;
......
...@@ -147,7 +147,6 @@ namespace oox { namespace ppt { ...@@ -147,7 +147,6 @@ namespace oox { namespace ppt {
{ {
case PPT_TOKEN( cBhvr ): case PPT_TOKEN( cBhvr ):
return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode );
break;
default: default:
break; break;
} }
...@@ -602,10 +601,8 @@ namespace oox { namespace ppt { ...@@ -602,10 +601,8 @@ namespace oox { namespace ppt {
{ {
case PPT_TOKEN( cBhvr ): case PPT_TOKEN( cBhvr ):
return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode );
break;
case PPT_TOKEN( tavLst ): case PPT_TOKEN( tavLst ):
return new TimeAnimValueListContext ( *this, rAttribs.getFastAttributeList(), maTavList ); return new TimeAnimValueListContext ( *this, rAttribs.getFastAttributeList(), maTavList );
break;
default: default:
break; break;
} }
......
...@@ -67,17 +67,14 @@ namespace svgio ...@@ -67,17 +67,14 @@ namespace svgio
default: /* StrokeLinecap_notset, StrokeLinecap_butt */ default: /* StrokeLinecap_notset, StrokeLinecap_butt */
{ {
return com::sun::star::drawing::LineCap_BUTT; return com::sun::star::drawing::LineCap_BUTT;
break;
} }
case StrokeLinecap_round: case StrokeLinecap_round:
{ {
return com::sun::star::drawing::LineCap_ROUND; return com::sun::star::drawing::LineCap_ROUND;
break;
} }
case StrokeLinecap_square: case StrokeLinecap_square:
{ {
return com::sun::star::drawing::LineCap_SQUARE; return com::sun::star::drawing::LineCap_SQUARE;
break;
} }
} }
} }
......
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