diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2013-01-19 17:14:01 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2013-01-19 17:16:33 +0100 |
commit | 8ab3715d8e622d06cfaa404842de2d9f8ea66ef5 (patch) | |
tree | 18918eb078e170087eb0ebd1f722146588346731 | |
parent | 558aebe27b92eab29456e510d98347083118e8cf (diff) |
Again Fix others Consecutive return, break
Change-Id: I67a453bb09b794c996f5f02a065abe8cef6ca3b6
-rw-r--r-- | lotuswordpro/source/filter/lwpborderstuff.cxx | 12 | ||||
-rw-r--r-- | oox/source/ppt/conditioncontext.cxx | 1 | ||||
-rw-r--r-- | oox/source/ppt/layoutfragmenthandler.cxx | 1 | ||||
-rw-r--r-- | oox/source/ppt/slidefragmenthandler.cxx | 1 | ||||
-rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 3 | ||||
-rw-r--r-- | svgio/source/svgreader/svgstyleattributes.cxx | 3 |
6 files changed, 0 insertions, 21 deletions
diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx b/lotuswordpro/source/filter/lwpborderstuff.cxx index 89f4062f5a5e..69591b4af0e3 100644 --- a/lotuswordpro/source/filter/lwpborderstuff.cxx +++ b/lotuswordpro/source/filter/lwpborderstuff.cxx @@ -167,16 +167,12 @@ sal_uInt16 LwpBorderStuff::GetSideType(sal_uInt16 side) { case LEFT: return m_nBoderGroupIDLeft; - break; case RIGHT: return m_nBoderGroupIDRight; - break; case TOP: return m_nBoderGroupIDTop; - break; case BOTTOM: return m_nBoderGroupIDBottom; - break; } // 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 @@ -189,16 +185,12 @@ LwpColor LwpBorderStuff::GetSideColor(sal_uInt16 side) { case LEFT: return m_aColorLeft; - break; case RIGHT: return m_aColorRight; - break; case TOP: return m_aColorTop; - break; case BOTTOM: return m_aColorBottom; - break; } // 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 @@ -211,16 +203,12 @@ float LwpBorderStuff::GetSideWidth(sal_uInt16 side) { case LEFT: return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthLeft)); - break; case RIGHT: return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthRight)); - break; case TOP: return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthTop)); - break; case BOTTOM: return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nWidthBottom)); - break; } // 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 diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index 8ef4881dea07..2fa15d23332e 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -178,7 +178,6 @@ namespace oox { namespace ppt { // add a condition to the list maConditions.push_back( AnimationCondition() ); return new CondContext( *this, rAttribs.getFastAttributeList(), mpNode, maConditions.back() ); - break; default: break; } diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx index d2e72e61f930..40c8f2a92853 100644 --- a/oox/source/ppt/layoutfragmenthandler.cxx +++ b/oox/source/ppt/layoutfragmenthandler.cxx @@ -66,7 +66,6 @@ ContextHandlerRef LayoutFragmentHandler::onCreateContext( sal_Int32 aElementToke } case PPT_TOKEN( hf ): // CT_HeaderFooter return new HeaderFooterContext( *this, rAttribs, mpSlidePersistPtr->getHeaderFooter() ); - break; default: return SlideFragmentHandler::onCreateContext( aElementToken, rAttribs ); } diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 8caa1a7abad0..12b0ebb40bd1 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -185,7 +185,6 @@ SlideFragmentHandler::~SlideFragmentHandler() throw() return this; case PPT_TOKEN( txStyles ): // CT_SlideMasterTextStyles return new SlideMasterTextStylesContext( *this, mpSlidePersistPtr ); - break; case PPT_TOKEN( custDataLst ): // CT_CustomerDataList case PPT_TOKEN( tagLst ): // CT_TagList return this; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 72c6bebab3d5..5e7227a95f0b 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -147,7 +147,6 @@ namespace oox { namespace ppt { { case PPT_TOKEN( cBhvr ): return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); - break; default: break; } @@ -602,10 +601,8 @@ namespace oox { namespace ppt { { case PPT_TOKEN( cBhvr ): return new CommonBehaviorContext ( *this, rAttribs.getFastAttributeList(), mpNode ); - break; case PPT_TOKEN( tavLst ): return new TimeAnimValueListContext ( *this, rAttribs.getFastAttributeList(), maTavList ); - break; default: break; } diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 07845df8c931..b85b27a85540 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -67,17 +67,14 @@ namespace svgio default: /* StrokeLinecap_notset, StrokeLinecap_butt */ { return com::sun::star::drawing::LineCap_BUTT; - break; } case StrokeLinecap_round: { return com::sun::star::drawing::LineCap_ROUND; - break; } case StrokeLinecap_square: { return com::sun::star::drawing::LineCap_SQUARE; - break; } } } |