sfx2/source/appl/appserv.cxx | 7 -------
sfx2/source/notebookbar/SfxNotebookBar.cxx | 10 ----------
sfx2/source/view/classificationhelper.cxx | 2 --
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 4 ----
writerfilter/source/dmapper/DomainMapper.cxx | 1 -
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 1 -
writerfilter/source/rtftok/rtfdispatchvalue.cxx | 3 ---
7 files changed, 28 deletions(-)
New commits:
commit 2e91522a5ce62a8489c75bd948f1dc68ddf1a56f
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Sat Feb 6 21:49:28 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Feb 7 14:32:54 2021 +0100
Remove unneeded breaks
Extending this:
https://gerrit.libreoffice.org/c/core/+/110512
Change-Id: I9e7cf757a346d603d0acb818be0c9bc488c8d5c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110516
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index b446a1e309c3..e5360c796183 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -124,25 +124,18 @@ namespace
{
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;
case vcl::EnumContext::Application::Formula:
return "Formula";
- break;
case vcl::EnumContext::Application::Base:
return "Base";
- break;
default:
return OUString();
- break;
}
}
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 115db13c872f..fa9b7f06bf13 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -98,22 +98,16 @@ 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;
case vcl::EnumContext::Application::Formula:
return "Formula";
- break;
default:
return OUString();
- break;
}
}
@@ -147,16 +141,12 @@ static OUString lcl_getNotebookbarFileName(
vcl::EnumContext::Application eApp )
{
case vcl::EnumContext::Application::Writer:
return officecfg::Office::UI::ToolbarMode::ActiveWriter::get();
- break;
case vcl::EnumContext::Application::Calc:
return officecfg::Office::UI::ToolbarMode::ActiveCalc::get();
- break;
case vcl::EnumContext::Application::Impress:
return officecfg::Office::UI::ToolbarMode::ActiveImpress::get();
- break;
case vcl::EnumContext::Application::Draw:
return officecfg::Office::UI::ToolbarMode::ActiveDraw::get();
- break;
default:
break;
diff --git a/sfx2/source/view/classificationhelper.cxx
b/sfx2/source/view/classificationhelper.cxx
index 85e7f3d55dde..c36856a5d624 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -905,10 +905,8 @@ const OUString&
SfxClassificationHelper::policyTypeToString(SfxClassificationPol
{
case SfxClassificationPolicyType::ExportControl:
return PROP_PREFIX_EXPORTCONTROL();
- break;
case SfxClassificationPolicyType::NationalSecurity:
return PROP_PREFIX_NATIONALSECURITY();
- break;
case SfxClassificationPolicyType::IntellectualProperty:
break;
}
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index a874390ceb33..e73547af427b 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3290,7 +3290,6 @@ void Content::lock(
// Detailed specification in:
// <http://tools.ietf.org/html/rfc4918#section-7.3>
return;
- break;
default:
//fallthrough
;
@@ -3300,7 +3299,6 @@ void Content::lock(
// we already hold the lock and it is in our internal lockstore
// just return as if the lock was successful
return;
- break;
default:
//fallthrough
;
@@ -3359,7 +3357,6 @@ void Content::unlock(
// acting as WebDAV and having lock/unlock enabled only
// for authorized user.
return;
- break;
case DAVException::DAV_HTTP_ERROR:
//grab the error code
switch( e.getStatus() )
@@ -3371,7 +3368,6 @@ void Content::unlock(
SAL_WARN( "ucb.ucp.webdav", "unlock() DAVException
(SC_NOT_IMPLEMENTED or SC_METHOD_NOT_ALLOWED) - URL: <"
<< m_xIdentifier->getContentIdentifier() <<
">, DAV ExceptionCode: " << e.getError() << ", HTTP error: " << e.getStatus() );
return;
- break;
default:
//fallthrough
;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 0aee54ae125e..9ea70164c96e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1268,7 +1268,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
{
case NS_ooxml::LN_background_background:
return;
- break;
default:
break;
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 3b62c912967e..a115badfe72a 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -147,7 +147,6 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t
nElement, const uno::Ref
case XML_Fallback:
// If Choice is already taken, then let's ignore the Fallback.
return m_bTookChoice;
- break;
default:
SAL_WARN("writerfilter",
"OOXMLFastContextHandler::prepareMceContext: unhandled element:" <<
oox::getBaseToken(nElement));
break;
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index f9198baafb12..8258f53d6267 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -688,17 +688,14 @@ bool RTFDocumentImpl::dispatchTableValue(RTFKeyword
nKeyword, int nParam)
NS_ooxml::LN_CT_TblCellMar_right, new
RTFValue(aAttributes));
}
return true;
- break;
case RTF_TRFTSWIDTH:
putNestedAttribute(m_aStates.top().getTableRowSprms(),
NS_ooxml::LN_CT_TblPrBase_tblW,
NS_ooxml::LN_CT_TblWidth_type, pIntValue);
return true;
- break;
case RTF_TRWWIDTH:
putNestedAttribute(m_aStates.top().getTableRowSprms(),
NS_ooxml::LN_CT_TblPrBase_tblW,
NS_ooxml::LN_CT_TblWidth_w, pIntValue);
return true;
- break;
default:
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
