bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx | 1
chart2/source/controller/main/ChartController.cxx | 1
comphelper/source/misc/anycompare.cxx | 14 ----
connectivity/source/drivers/flat/ETable.cxx | 1
cui/source/customize/CustomNotebookbarGenerator.cxx | 10 ---
dbaccess/source/filter/xml/xmlStyleImport.cxx | 1
dbaccess/source/filter/xml/xmlfilter.cxx | 5 -
editeng/source/items/frmitems.cxx | 1
filter/source/graphicfilter/icgm/bitmap.cxx | 1
filter/source/msfilter/escherex.cxx | 1
i18nlangtag/source/languagetag/languagetag.cxx | 6 -
lotuswordpro/source/filter/xfilter/xfutil.cxx | 52 ----------------
winaccessibility/source/service/AccObjectWinManager.cxx | 2
13 files changed, 96 deletions(-)
New commits:
commit 974dc88a06603f2f119f603c2581870e4e7ea7bc
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Sun Feb 7 21:47:10 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Feb 10 08:52:11 2021 +0100
Remove unneeded breaks
Extending this:
https://gerrit.libreoffice.org/c/core/+/110512
Change-Id: If7e6f9c4079c2e0b48e642aa0b140fb4e03996bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110520
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
index e33969ae789c..cb0661e7fd6a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx
@@ -113,7 +113,6 @@ namespace
break;
default:
return false;
- break;
}
}
return true;
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index be8dffbaee44..d19f3b97ef32 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -291,7 +291,6 @@ OUString ChartController::GetContextName()
{
case OBJECTTYPE_DATA_SERIES:
return "Series";
- break;
case OBJECTTYPE_DATA_ERRORS_X:
case OBJECTTYPE_DATA_ERRORS_Y:
case OBJECTTYPE_DATA_ERRORS_Z:
diff --git a/comphelper/source/misc/anycompare.cxx
b/comphelper/source/misc/anycompare.cxx
index 106892400c7c..d802024e7502 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -242,46 +242,32 @@ namespace comphelper
return ScalarPredicateLess< sal_Unicode >().isLess(lhs, rhs);
case TypeClass_BOOLEAN:
return ScalarPredicateLess< bool >().isLess(lhs, rhs);
- break;
case TypeClass_BYTE:
return ScalarPredicateLess< sal_Int8 >().isLess(lhs, rhs);
- break;
case TypeClass_SHORT:
return ScalarPredicateLess< sal_Int16 >().isLess(lhs, rhs);
- break;
case TypeClass_UNSIGNED_SHORT:
return ScalarPredicateLess< sal_uInt16 >().isLess(lhs, rhs);
- break;
case TypeClass_LONG:
return ScalarPredicateLess< sal_Int32 >().isLess(lhs, rhs);
- break;
case TypeClass_UNSIGNED_LONG:
return ScalarPredicateLess< sal_uInt32 >().isLess(lhs, rhs);
- break;
case TypeClass_HYPER:
return ScalarPredicateLess< sal_Int64 >().isLess(lhs, rhs);
- break;
case TypeClass_UNSIGNED_HYPER:
return ScalarPredicateLess< sal_uInt64 >().isLess(lhs, rhs);
- break;
case TypeClass_FLOAT:
return ScalarPredicateLess< float >().isLess(lhs, rhs);
- break;
case TypeClass_DOUBLE:
return ScalarPredicateLess< double >().isLess(lhs, rhs);
- break;
case TypeClass_STRING:
return StringPredicateLess().isLess(lhs, rhs);
- break;
case TypeClass_TYPE:
return TypePredicateLess().isLess(lhs, rhs);
- break;
case TypeClass_ENUM:
return EnumPredicateLess( lhs.getValueType() ).isLess(lhs, rhs);
- break;
case TypeClass_INTERFACE:
return InterfacePredicateLess().isLess(lhs, rhs);
- break;
case TypeClass_STRUCT:
if ( lhs.getValueType().equals( ::cppu::UnoType< Date >::get() ) )
return DatePredicateLess().isLess(lhs, rhs);
diff --git a/connectivity/source/drivers/flat/ETable.cxx
b/connectivity/source/drivers/flat/ETable.cxx
index 0dceba05b641..fa4305e991a4 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -784,7 +784,6 @@ bool OFlatTable::seekRow(IResultSetHelper::Movement
eCursorPosition, sal_Int32 n
}
// m_nMaxRowCount can still be zero, but now it means there a
genuinely zero rows in the table
return seekRow(IResultSetHelper::ABSOLUTE1, m_nMaxRowCount,
nCurPos);
- break;
case IResultSetHelper::RELATIVE1:
{
const sal_Int32 nNewRowPos = m_nRowPos + nOffset;
diff --git a/cui/source/customize/CustomNotebookbarGenerator.cxx
b/cui/source/customize/CustomNotebookbarGenerator.cxx
index 365c7f9f00d5..392ea3e37a4e 100644
--- a/cui/source/customize/CustomNotebookbarGenerator.cxx
+++ b/cui/source/customize/CustomNotebookbarGenerator.cxx
@@ -42,19 +42,14 @@ static OUString
lcl_activeAppName(vcl::EnumContext::Application eApp)
{
case vcl::EnumContext::Application::Writer:
return "ActiveWriter";
- break;
case vcl::EnumContext::Application::Calc:
return "ActiveCalc";
- break;
case vcl::EnumContext::Application::Impress:
return "ActiveImpress";
- break;
case vcl::EnumContext::Application::Draw:
return "ActiveDraw";
- break;
default:
return OUString();
- break;
}
}
@@ -64,19 +59,14 @@ static OUString
lcl_getAppName(vcl::EnumContext::Application eApp)
{
case vcl::EnumContext::Application::Writer:
return "Writer";
- break;
case vcl::EnumContext::Application::Calc:
return "Calc";
- break;
case vcl::EnumContext::Application::Impress:
return "Impress";
- break;
case vcl::EnumContext::Application::Draw:
return "Draw";
- break;
default:
return OUString();
- break;
}
}
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx
b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index e5a5970c2e00..ddadc5e3b91f 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -205,7 +205,6 @@ SvXMLStyleContext
*OTableStylesContext::CreateStyleStyleChildContext(
case XmlStyleFamily::TABLE_COLUMN:
case XmlStyleFamily::TABLE_CELL:
return new OTableStyleContext( GetOwnImport(), *this, nFamily );
- break;
default: break;
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 24516771289c..ccc4b83d4ebc 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -402,12 +402,10 @@ public:
case XML_ELEMENT(OOO, XML_STYLES):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
return rImport.CreateStylesContext(false);
- break;
case XML_ELEMENT(OFFICE, XML_AUTOMATIC_STYLES):
case XML_ELEMENT(OOO, XML_AUTOMATIC_STYLES):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
return rImport.CreateStylesContext(true);
- break;
}
return nullptr;
}
@@ -454,15 +452,12 @@ public:
case XML_ELEMENT(OFFICE, XML_BODY):
case XML_ELEMENT(OOO, XML_BODY):
return new DBXMLDocumentBodyContext(rImport);
- break;
case XML_ELEMENT(OFFICE, XML_SCRIPTS):
return new XMLScriptContext(GetImport(), rImport.GetModel());
- break;
case XML_ELEMENT(OFFICE, XML_AUTOMATIC_STYLES):
case XML_ELEMENT(OOO, XML_AUTOMATIC_STYLES):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
return rImport.CreateStylesContext(true);
- break;
default: break;
}
return nullptr;
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 6e963e91cbaa..45cd825eab54 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1441,7 +1441,6 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
// it doesn't make sense to return a value for these since it's
// probably ambiguous
return true;
- break;
}
if( bDistMember )
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx
b/filter/source/graphicfilter/icgm/bitmap.cxx
index d857c5848ed6..72946094ed38 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -58,7 +58,6 @@ namespace
case 8:
case 24:
return true;
- break;
default:
break;
}
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 31d382796f43..536b94ce8cf6 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2127,7 +2127,6 @@ static void lcl_Rotate(Degree100 nAngle, Point center,
Point& pt)
break;
default:
return;
- break;
}
sal_Int32 x0 =pt.X()-center.X();
sal_Int32 y0 =pt.Y()-center.Y();
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index d5b1dcd1e2a6..850e404e363c 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -3031,7 +3031,6 @@ LanguageTag
makeLanguageTagFromAppleLanguageId(AppleLanguageId nLanguage)
break;
case AppleLanguageId::AZERI_ARABIC:
return LanguageTag("az-Arab");
- break;
case AppleLanguageId::ARMENIAN:
nLang = LANGUAGE_ARMENIAN;
break;
@@ -3154,7 +3153,6 @@ LanguageTag
makeLanguageTagFromAppleLanguageId(AppleLanguageId nLanguage)
break;
case AppleLanguageId::RUNDI:
return LanguageTag("rn");
- break;
case AppleLanguageId::NYANJA:
nLang = LANGUAGE_USER_NYANJA;
break;
@@ -3184,7 +3182,6 @@ LanguageTag
makeLanguageTagFromAppleLanguageId(AppleLanguageId nLanguage)
break;
case AppleLanguageId::AYMARA:
return LanguageTag("ay");
- break;
case AppleLanguageId::TATAR:
nLang = LANGUAGE_TATAR;
break;
@@ -3196,10 +3193,8 @@ LanguageTag
makeLanguageTagFromAppleLanguageId(AppleLanguageId nLanguage)
break;
case AppleLanguageId::JAVANESE_LATIN:
return LanguageTag("jv-Latn");
- break;
case AppleLanguageId::SUNDANESE_LATIN:
return LanguageTag("su-Latn");
- break;
case AppleLanguageId::GALICIAN:
nLang = LANGUAGE_GALICIAN;
break;
@@ -3220,7 +3215,6 @@ LanguageTag
makeLanguageTagFromAppleLanguageId(AppleLanguageId nLanguage)
break;
case AppleLanguageId::IRISH_GAELIC_WITH_DOT_ABOVE:
return LanguageTag("ga-Latg");
- break;
case AppleLanguageId::TONGAN:
return LanguageTag("to");
break;
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx
b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index fe2e37b78468..dd212b21a64d 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -92,58 +92,40 @@ OUString GetUnderlineName(enumXFUnderline type)
{
case enumXFUnderlineNone:
return "none";
- break;
case enumXFUnderlineSingle:
return "single";
- break;
case enumXFUnderlineDouble:
return "double";
- break;
case enumXFUnderlineDotted:
return "dotted";
- break;
case enumXFUnderlineDash:
return "dash";
- break;
case enumXFUnderlineLongDash:
return "long-dash";
- break;
case enumXFUnderlineDotDash:
return "dot-dash";
- break;
case enumXFUnderlineDotDotDash:
return "dot-dot-dash";
- break;
case enumXFUnderlineWave:
return "wave";
- break;
case enumXFUnderlineBold:
return "bold";
- break;
case enumXFUnderlineBoldDotted:
return "bold-dotted";
- break;
case enumXFUnderlineBoldDash:
return "bold-dash";
- break;
case enumXFUnderlineBoldLongDash:
return "bold-long-dash";
- break;
case enumXFUnderlineBoldDotDash:
return "bold-dot-dash";
- break;
case enumXFUnderlineBoldDotDotDash:
return "bold-dot-dot-dash";
- break;
case enumXFUnderlineBoldWave:
return "bold-wave";
- break;
case enumXFUnderlineDoubleWave:
return "double-wave";
- break;
case enumXFUnderlineSmallWave:
return "small-wave";
- break;
}
return OUString();
}
@@ -154,19 +136,14 @@ OUString GetCrossoutName(enumXFCrossout type)
{
case enumXFCrossoutSignel:
return "single-line";
- break;
case enumXFCrossoutDouble:
return "double-line";
- break;
case enumXFCrossoutThick:
return "thick-line";
- break;
case enumXFCrossoutSlash:
return "slash";
- break;
case enumXFCrossoutX:
return "X";
- break;
default:
break;
}
@@ -178,16 +155,12 @@ OUString GetTransformName(enumXFTransform type)
switch(type) {
case enumXFTransformUpper:
return "uppercase";
- break;
case enumXFTransformLower:
return "lowercase";
- break;
case enumXFTransformCapitalize:
return "capitalize";
- break;
case enumXFTransformSmallCaps:
return "small-caps";
- break;
default:
break;
}
@@ -200,28 +173,20 @@ OUString GetTextDirName(enumXFTextDir dir)
{
case enumXFTextDirLR:
return "lr";
- break;
case enumXFTextDirLR_TB:
return "lr-tb";
- break;
case enumXFTextDirPage:
return "page";
- break;
case enumXFTextDirRL:
return "rl";
- break;
case enumXFTextDirRL_TB:
return "rl-tb";
- break;
case enumXFTextDirTB:
return "tb";
- break;
case enumXFTextDirTB_LR:
return "tb-lr";
- break;
case enumXFTextDirTB_RL:
return "tb-rl";
- break;
default:
break;
}
@@ -234,16 +199,12 @@ OUString GetFrameXPos(enumXFFrameXPos pos)
{
case enumXFFrameXPosLeft:
return "left";
- break;
case enumXFFrameXPosRight:
return "right";
- break;
case enumXFFrameXPosCenter:
return "center";
- break;
case enumXFFrameXPosFromLeft:
return "from-left";
- break;
default:
break;
}
@@ -256,43 +217,30 @@ OUString GetFrameXRel(enumXFFrameXRel rel)
{
case enumXFFrameXRelPage:
return "page";
- break;
case enumXFFrameXRelPageContent:
return "page-content";
- break;
case enumXFFrameXRelPageEndMargin:
return "page-end-margin";
- break;
case enumXFFrameXRelPageStartMargin:
return "page-start-margin";
- break;
case enumXFFrameXRelPara:
return "paragraph";
- break;
case enumXFFrameXRelParaContent:
return "paragraph-content";
- break;
case enumXFFrameXRelParaEndMargin:
return "paragraph-end-margin";
- break;
case enumXFFrameXRelParaStartMargin:
return "paragraph-start-margin";
- break;
case enumXFFrameXRelChar:
return "char";
- break;
case enumXFFrameXRelFrame:
return "frame";
- break;
case enumXFFrameXRelFrameContent:
return "frame-content";
- break;
case enumXFFrameXRelFrameEndMargin:
return "frame-end-margin";
- break;
case enumXFFrameXRelFrameStartMargin:
return "frame-start-margin";
- break;
default:
break;
}
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx
b/winaccessibility/source/service/AccObjectWinManager.cxx
index 2ed47a061f31..1e74be1d0369 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -1060,7 +1060,6 @@ bool AccObjectWinManager::IsContainer(XAccessible*
pAccessible)
case /*AccessibleRole::*/VIEW_PORT:
case /*AccessibleRole::*/SHAPE:
return true;
- break;
case /*AccessibleRole::*/COLUMN_HEADER:
case /*AccessibleRole::*/TABLE:
if(!IsStateManageDescendant(pAccessible))
@@ -1068,7 +1067,6 @@ bool AccObjectWinManager::IsContainer(XAccessible*
pAccessible)
break;
case /*AccessibleRole::*/MENU:
return true;
- break;
default:
return false;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
