oox/source/drawingml/graphicshapecontext.cxx | 1 -
oox/source/drawingml/linepropertiescontext.cxx | 1 -
oox/source/drawingml/shapecontext.cxx | 1 -
oox/source/drawingml/shapepropertiescontext.cxx | 2 --
oox/source/drawingml/textbodycontext.cxx | 2 --
oox/source/vml/vmltextboxcontext.cxx | 2 --
reportdesign/source/filter/xml/xmlfilter.cxx | 7 -------
sal/rtl/ustring.cxx | 1 -
sc/source/core/data/attrib.cxx | 3 ---
sc/source/core/data/column2.cxx | 3 ---
sc/source/core/data/column3.cxx | 1 -
sc/source/core/data/dpcache.cxx | 3 ---
sc/source/core/data/formulacell.cxx | 1 -
sc/source/core/data/global.cxx | 1 -
sc/source/core/data/mtvelements.cxx | 1 -
15 files changed, 30 deletions(-)
New commits:
commit 0b1b167c3f7fa802532373699589104fe4b391c7
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Sun Feb 7 20:59:14 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Feb 8 21:05:05 2021 +0100
Remove unneeded breaks
Extending this:
https://gerrit.libreoffice.org/c/core/+/110512
Change-Id: I1c5bfcddeb0f5619dc848bbf02408cf166bebc8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110521
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index eaf650c051ba..113e5490c51d 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -228,7 +228,6 @@ ContextHandlerRef
OleObjectGraphicDataContext::onCreateContext( sal_Int32 nEleme
break;
case PPT_TOKEN( pic ):
return new GraphicShapeContext( *this, mpMasterShapePtr,
mpShapePtr );
- break;
}
SAL_WARN("oox", "OleObjectGraphicDataContext::onCreateContext: unhandled
element: "
<< getBaseToken(nElement));
diff --git a/oox/source/drawingml/linepropertiescontext.cxx
b/oox/source/drawingml/linepropertiescontext.cxx
index dd9af49bf2db..322f98aad609 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -64,7 +64,6 @@ ContextHandlerRef LinePropertiesContext::onCreateContext(
sal_Int32 nElement, co
break;
case A_TOKEN( custDash ): // CT_DashStopList
return this;
- break;
case A_TOKEN( ds ):
{
// 'a:ds' has 2 attributes : 'd' and 'sp'
diff --git a/oox/source/drawingml/shapecontext.cxx
b/oox/source/drawingml/shapecontext.cxx
index 8d76755855c9..e0cbf9343c1d 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -110,7 +110,6 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
aElementToken, const
if (!mpShapePtr->getTextBody())
mpShapePtr->setTextBody( std::make_shared<TextBody>() );
return new TextBodyPropertiesContext( *this, rAttribs, mpShapePtr );
- break;
case XML_txbx:
break;
case XML_cNvPicPr:
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx
b/oox/source/drawingml/shapepropertiescontext.cxx
index 574e0793c89a..e0fc3274c731 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -95,12 +95,10 @@ ContextHandlerRef ShapePropertiesContext::onCreateContext(
sal_Int32 aElementTok
// todo not supported by core, only for preservation via grab bags
case A_TOKEN( scene3d ): // CT_Scene3D
return new Scene3DPropertiesContext( *this, mrShape.get3DProperties()
);
- break;
// todo not supported by core, only for preservation via grab bags
case A_TOKEN( sp3d ): // CT_Shape3D
return new Shape3DPropertiesContext( *this, rAttribs,
mrShape.get3DProperties() );
- break;
}
return FillPropertiesContext::createFillContext( *this, aElementToken,
rAttribs, mrShape.getFillProperties() );
diff --git a/oox/source/drawingml/textbodycontext.cxx
b/oox/source/drawingml/textbodycontext.cxx
index f4c33f7253e0..49b50309f597 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -99,10 +99,8 @@ ContextHandlerRef TextParagraphContext::onCreateContext(
sal_Int32 aElementToken
break;
case W_TOKEN( ins ):
return this;
- break;
case OOX_TOKEN(a14, m):
return CreateLazyMathBufferingContext(*this, mrParagraph);
- break;
default:
SAL_WARN("oox", "TextParagraphContext::onCreateContext: unhandled
element: " << getBaseToken(aElementToken));
}
diff --git a/oox/source/vml/vmltextboxcontext.cxx
b/oox/source/vml/vmltextboxcontext.cxx
index d878c6dcdf3d..2cf5ebfaf40d 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -249,11 +249,9 @@ ContextHandlerRef TextBoxContext::onCreateContext(
sal_Int32 nElement, const Att
return new TextPortionContext( *this, mrTextBox, maParagraph,
TextFontModel(), nElement, rAttribs );
else
return this;
- break;
case W_TOKEN(pPr):
case W_TOKEN(sdt):
return this;
- break;
default:
SAL_INFO("oox", "unhandled 0x" << std::hex << getCurrentElement());
break;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 2fbbb37992d6..8406723095be 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -561,22 +561,18 @@ public:
case XML_ELEMENT(OFFICE, XML_FONT_FACE_DECLS):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
return rImport.CreateFontDeclsContext();
- break;
case XML_ELEMENT(OFFICE, XML_MASTER_STYLES):
{
SvXMLStylesContext* pStyleContext = new
RptMLMasterStylesContext_Impl(rImport);
rImport.SetMasterStyles(pStyleContext);
return pStyleContext;
}
- break;
case XML_ELEMENT(OFFICE, XML_STYLES):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
return rImport.CreateStylesContext(false);
- break;
case XML_ELEMENT(OFFICE, XML_AUTOMATIC_STYLES):
// don't use the autostyles from the styles-document for the
progress
return rImport.CreateStylesContext(true);
- break;
}
return nullptr;
}
@@ -624,15 +620,12 @@ public:
{
case XML_ELEMENT(OFFICE, XML_BODY):
return new RptXMLDocumentBodyContext(rImport);
- break;
case XML_ELEMENT(OFFICE, XML_FONT_FACE_DECLS):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
return rImport.CreateFontDeclsContext();
- break;
case XML_ELEMENT(OFFICE, XML_AUTOMATIC_STYLES):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
return rImport.CreateStylesContext(true);
- break;
}
return nullptr;
}
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 68a1a4449c4d..a5efa62d759c 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -946,7 +946,6 @@ static int rtl_canGuessUOutputLength( int len,
rtl_TextEncoding eTextEncoding )
case RTL_TEXTENCODING_IBM_863:
case RTL_TEXTENCODING_IBM_865:
return len;
- break;
}
return 0;
}
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index cb39fec0b2f0..1ae01ef1c26f 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -539,7 +539,6 @@ bool ScViewObjectModeItem::GetPresentation
else
rText += ScResId(STR_VOBJ_MODE_HIDE);
return true;
- break;
default: break;
// added to avoid warnings
@@ -620,12 +619,10 @@ bool ScPageScaleToItem::GetPresentation(
case SfxItemPresentation::Nameless:
rText = aValue;
return true;
- break;
case SfxItemPresentation::Complete:
rText = aName + " (" + aValue + ")";
return true;
- break;
default:
OSL_FAIL( "ScPageScaleToItem::GetPresentation - unknown
presentation mode" );
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 22d5a16de895..d194ab134dd1 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3523,18 +3523,15 @@ public:
case sc::element_type_numeric:
case sc::element_type_string:
return node.size;
- break;
case sc::element_type_formula:
{
// Each formula cell is worth its code length plus 5.
return std::accumulate(sc::formula_block::begin(*node.data),
sc::formula_block::end(*node.data), size_t(0),
[](const size_t& rCount, const ScFormulaCell* p) { return
rCount + 5 + p->GetCode()->GetCodeLen(); });
}
- break;
case sc::element_type_edittext:
// each edit-text cell is worth 50.
return node.size * 50;
- break;
default:
return 0;
}
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index f1a621a985b5..14d1ebdc09c4 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -837,7 +837,6 @@ public:
deleteNumeric(node, nOffset, nDataSize);
return;
- break;
case sc::element_type_string:
case sc::element_type_edittext:
if (!mbString)
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index d16ceb957c61..a9fe44f3f4e7 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -1175,13 +1175,10 @@ sal_uInt32 ScDPCache::GetLocaleIndependentFormat(
SvNumberFormatter& rFormatter,
{
case SvNumFormatType::DATE:
return rFormatter.GetFormatIndex( NF_DATE_ISO_YYYYMMDD,
LANGUAGE_ENGLISH_US);
- break;
case SvNumFormatType::TIME:
return rFormatter.GetFormatIndex( NF_TIME_HHMMSS,
LANGUAGE_ENGLISH_US);
- break;
case SvNumFormatType::DATETIME:
return rFormatter.GetFormatIndex( NF_DATETIME_ISO_YYYYMMDD_HHMMSS,
LANGUAGE_ENGLISH_US);
- break;
default:
return rFormatter.GetFormatIndex( NF_NUMBER_STANDARD,
LANGUAGE_ENGLISH_US);
}
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 707acf1d355c..cad18eb8022a 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3576,7 +3576,6 @@ bool ScFormulaCell::UpdateReference(
{
case URM_INSDEL:
return UpdatePosOnShift(rCxt);
- break;
default:
;
}
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 3a87e3a95577..458e81da5188 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -417,7 +417,6 @@ OUString ScGlobal::GetLongErrorString(FormulaError nErr)
break;
default:
return ScResId(STR_ERROR_STR) + OUString::number(
static_cast<int>(nErr) );
- break;
}
return ScResId(pErrNumber);
}
diff --git a/sc/source/core/data/mtvelements.cxx
b/sc/source/core/data/mtvelements.cxx
index 56c0fbab0d9a..792b4e9d60e6 100644
--- a/sc/source/core/data/mtvelements.cxx
+++ b/sc/source/core/data/mtvelements.cxx
@@ -168,7 +168,6 @@ ScRefCellValue toRefCell( const
sc::CellStoreType::const_iterator& itPos, size_t
case sc::element_type_edittext:
// Edit cell
return ScRefCellValue(sc::edittext_block::at(*itPos->data,
nOffset));
- break;
case sc::element_type_formula:
// Formula cell
return ScRefCellValue(sc::formula_block::at(*itPos->data,
nOffset));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
