lotuswordpro/source/filter/lwpborderstuff.cxx | 12 ------------
lotuswordpro/source/filter/lwpmargins.hxx | 4 ----
oox/source/ppt/conditioncontext.cxx | 1 -
oox/source/ppt/layoutfragmenthandler.cxx | 1 -
oox/source/ppt/slidefragmenthandler.cxx | 1 -
oox/source/ppt/timenodelistcontext.cxx | 3 ---
svgio/source/svgreader/svgstyleattributes.cxx | 3 ---
svgio/source/svgreader/svgtools.cxx | 4 ----
8 files changed, 29 deletions(-)
New commits:
commit 8ab3715d8e622d06cfaa404842de2d9f8ea66ef5
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Jan 19 17:14:01 2013 +0100
Again Fix others Consecutive return, break
Change-Id: I67a453bb09b794c996f5f02a065abe8cef6ca3b6
diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx
b/lotuswordpro/source/filter/lwpborderstuff.cxx
index 89f4062..69591b4 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 8ef4881..2fa15d2 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 d2e72e6..40c8f2a 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 8caa1a7..12b0ebb 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 72c6beb..5e7227a 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 07845df..b85b27a 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;
}
}
}
commit 558aebe27b92eab29456e510d98347083118e8cf
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Jan 19 17:07:40 2013 +0100
Fix others Consecutive return, break
Change-Id: Ia93de768b83a44135c1a8df852a6fbdee1c759d2
diff --git a/svgio/source/svgreader/svgtools.cxx
b/svgio/source/svgreader/svgtools.cxx
index ae0df2f..899fed8 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -160,17 +160,14 @@ namespace svgio
case Unit_em:
{
return mfNumber * rInfoProvider.getCurrentFontSize();
- break;
}
case Unit_ex:
{
return mfNumber * rInfoProvider.getCurrentXHeight() *
0.5;
- break;
}
case Unit_px:
{
return mfNumber;
- break;
}
case Unit_pt:
case Unit_pc:
@@ -235,7 +232,6 @@ namespace svgio
}
return fRetval;
- break;
}
default:
{
commit 259af2832e953adfde2b4439d4f18ea316e5b078
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Jan 19 16:55:22 2013 +0100
Fix Consecutive return, break
Change-Id: I7e7586f430b4c33d4bdc786622fcf3680021d517
diff --git a/lotuswordpro/source/filter/lwpmargins.hxx
b/lotuswordpro/source/filter/lwpmargins.hxx
index 6dad472..e733f58 100644
--- a/lotuswordpro/source/filter/lwpmargins.hxx
+++ b/lotuswordpro/source/filter/lwpmargins.hxx
@@ -101,16 +101,12 @@ inline double LwpMargins::GetMarginsValue(const
sal_uInt8& nWhichSide)
{
case MARGIN_LEFT://left
return LwpTools::ConvertFromUnitsToMetric(m_nLeft);
- break;
case MARGIN_RIGHT://right
return LwpTools::ConvertFromUnitsToMetric(m_nRight);
- break;
case MARGIN_TOP://top
return LwpTools::ConvertFromUnitsToMetric(m_nTop);
- break;
case MARGIN_BOTTOM://bottom
return LwpTools::ConvertFromUnitsToMetric(m_nBottom);
- 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
