summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-08 09:46:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-08 13:28:16 +0100
commitab9b67bbb001f380b3973941443bfbc59fe7141c (patch)
tree4737847b2970d2310932f115935a9454aacff6fe /configmgr
parent3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff)
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b "HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now" Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937 Reviewed-on: https://gerrit.libreoffice.org/64800 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/access.cxx2
-rw-r--r--configmgr/source/components.cxx4
-rw-r--r--configmgr/source/configurationregistry.cxx2
-rw-r--r--configmgr/source/type.cxx2
-rw-r--r--configmgr/source/valueparser.cxx4
-rw-r--r--configmgr/source/xcdparser.cxx2
-rw-r--r--configmgr/source/xcsparser.cxx4
-rw-r--r--configmgr/source/xcuparser.cxx2
8 files changed, 11 insertions, 11 deletions
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 26c8e7e5c516..7bbd1b05e287 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -665,7 +665,7 @@ void Access::setName(OUString const & aName)
}
}
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case Node::KIND_LOCALIZED_PROPERTY:
// renaming a property could only work for an extension property,
// but a localized property is never an extension property
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index af666ba2b719..e584a3c98589 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -681,7 +681,7 @@ void Components::parseFiles(
if (!recursive) {
return;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
throw css::uno::RuntimeException(
"cannot open directory " + url);
@@ -846,7 +846,7 @@ void Components::parseXcsXcuIniLayer(
case ':':
case '\\':
prefix.append('\\');
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
prefix.append(c);
}
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 628640c43974..b049299c1fea 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -407,7 +407,7 @@ css::registry::RegistryValueType RegistryKey::getValueType()
{
return css::registry::RegistryValueType_STRINGLIST;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
return css::registry::RegistryValueType_NOT_DEFINED;
}
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index f0d109d74fcc..ab84fcb9c3bb 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -155,7 +155,7 @@ Type getDynamicType(css::uno::Any const & value) {
return TYPE_HEXBINARY_LIST;
}
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
return TYPE_ERROR;
}
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 10860628e491..4dda54c410e4 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -260,7 +260,7 @@ xmlreader::XmlReader::Text ValueParser::getTextMode() const {
if (!items_.empty()) {
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case State::IT:
return
(type_ == TYPE_STRING || type_ == TYPE_STRING_LIST ||
@@ -291,7 +291,7 @@ bool ValueParser::startElement(
state_ = State::IT;
return true;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case State::IT:
if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals("unicode") &&
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index 553087a38c4a..c5e8a9b017db 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -116,7 +116,7 @@ bool XcdParser::startElement(
return true;
}
state_ = STATE_COMPONENTS;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case STATE_COMPONENTS:
if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals("component-schema"))
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 271d617e5019..411da6ca7915 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -158,7 +158,7 @@ bool XcsParser::startElement(
state_ = STATE_TEMPLATES;
return true;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case STATE_TEMPLATES_DONE:
if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals("component"))
@@ -188,7 +188,7 @@ bool XcsParser::startElement(
}
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case STATE_COMPONENT:
assert(!elements_.empty());
switch (elements_.top().node->kind()) {
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 7db53e3e77fb..8a165cb1be02 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -642,7 +642,7 @@ void XcuParser::handleUnknownGroupProp(
recordModification(false);
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
SAL_WARN(
"configmgr",