oox/source/shape/LockedCanvasContext.cxx | 2 --
oox/source/shape/WpgContext.cxx | 2 --
oox/source/shape/WpsContext.cxx | 1 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 5 -----
writerfilter/source/rtftok/rtfdispatchflag.cxx | 4 ----
writerfilter/source/rtftok/rtfsprm.cxx | 2 --
6 files changed, 16 deletions(-)
New commits:
commit 86138007287e1d47fe436142c26345ea7a9986a9
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Jun 11 22:37:08 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Jun 12 08:58:06 2019 +0200
sw: merge some indentical switch-case branches
Change-Id: I9c247f6d5b3d1309b6831a87c041de0a9cf6affc
Reviewed-on: https://gerrit.libreoffice.org/73840
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/oox/source/shape/LockedCanvasContext.cxx
b/oox/source/shape/LockedCanvasContext.cxx
index a460a9585425..35d4aa62c65f 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -35,9 +35,7 @@ LockedCanvasContext::~LockedCanvasContext() = default;
switch (getBaseToken(nElementToken))
{
case XML_lockedCanvas:
- break;
case XML_nvGrpSpPr:
- break;
case XML_grpSpPr:
break;
case XML_sp:
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index 33fb318e73e8..d09187fce7f1 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -39,9 +39,7 @@ oox::core::ContextHandlerRef
WpgContext::onCreateContext(sal_Int32 nElementToken
switch (getBaseToken(nElementToken))
{
case XML_wgp:
- break;
case XML_cNvGrpSpPr:
- break;
case XML_grpSpPr:
return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
case XML_wsp:
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 132143685c90..3b2e3c624ed9 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -52,7 +52,6 @@ oox::core::ContextHandlerRef
WpsContext::onCreateContext(sal_Int32 nElementToken
switch (getBaseToken(nElementToken))
{
case XML_wsp:
- break;
case XML_cNvCnPr:
break;
case XML_bodyPr:
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 765dee2c2455..fca115a6e26f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -475,7 +475,6 @@ OString RtfAttributeOutput::MoveCharacterProperties(bool
aAutoWriteRtlLtr)
break;
case i18n::ScriptType::COMPLEX:
/* noop */
- break;
default:
/* should not happen? */
break;
@@ -3384,13 +3383,9 @@ void RtfAttributeOutput::FormatFillGradient(const
XFillGradientItem& rFillGradie
std::make_pair<OString, OString>("fillFocus",
OString::number(50)));
break;
case css::awt::GradientStyle_RADIAL:
- break;
case css::awt::GradientStyle_ELLIPTICAL:
- break;
case css::awt::GradientStyle_SQUARE:
- break;
case css::awt::GradientStyle_RECT:
- break;
default:
break;
}
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx
b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 3ea7872d52a1..d76dc4cb1d81 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -830,16 +830,12 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword
nKeyword)
break;
case RTF_AENDDOC:
// Noop, this is the default in Writer.
- break;
case RTF_AENDNOTES:
// Noop, Writer does not support having endnotes at the end of
section.
- break;
case RTF_AFTNRSTCONT:
// Noop, this is the default in Writer.
- break;
case RTF_AFTNRESTART:
// Noop, Writer does not support restarting endnotes at each
section.
- break;
case RTF_FTNBJ:
// Noop, this is the default in Writer.
break;
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx
b/writerfilter/source/rtftok/rtfsprm.cxx
index a4c956dec3e4..15026cb93ea4 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -203,10 +203,8 @@ static bool isSPRMChildrenExpected(Id nId)
case NS_ooxml::LN_CT_PBdr_bottom:
case NS_ooxml::LN_CT_PBdr_right:
// Expected children are NS_ooxml::LN_CT_Border_*.
- [[fallthrough]];
case NS_ooxml::LN_CT_PrBase_shd:
// Expected children are NS_ooxml::LN_CT_Shd_*.
- [[fallthrough]];
case NS_ooxml::LN_CT_PPrBase_ind:
// Expected children are NS_ooxml::LN_CT_Ind_*.
return true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
