summaryrefslogtreecommitdiff
path: root/xmloff/source/style/numehelp.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
commit14cd5182c5f64c43581c82db8c958369152226ac (patch)
tree57f150ba2707f29214eeb9b1eaad2373780d1b15 /xmloff/source/style/numehelp.cxx
parente4bb2b4f4875c15bd68297b5be716edd6859841e (diff)
Replace fallthrough comments with new SAL_FALLTHROUGH macro
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in preparation of enabling -Wimplicit-fallthrough. (This is only relevant for C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.) Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but that would require adding back in dependencies on boost_headers to many libraries where we carefully removed any remaining Boost dependencies only recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its future evolution will not have any impact on the stable URE interface.) C++17 will have a proper [[fallthroug]], eventually removing the need for a macro altogether. Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'xmloff/source/style/numehelp.cxx')
-rw-r--r--xmloff/source/style/numehelp.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 2e13bca105d5..84288edf105c 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -118,7 +118,8 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT);
bWasSetTypeAttribute = true;
}
- } // No Break
+ SAL_FALLTHROUGH;
+ }
case util::NumberFormat::PERCENT:
{
if (!bWasSetTypeAttribute)
@@ -126,7 +127,8 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_PERCENTAGE);
bWasSetTypeAttribute = true;
}
- } // No Break
+ SAL_FALLTHROUGH;
+ }
case util::NumberFormat::CURRENCY:
{
if (!bWasSetTypeAttribute)
@@ -385,7 +387,8 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
pExport->AddAttribute(sAttrValType, XML_FLOAT);
bWasSetTypeAttribute = true;
}
- } // No Break
+ SAL_FALLTHROUGH;
+ }
case util::NumberFormat::PERCENT:
{
if (!bWasSetTypeAttribute)
@@ -393,7 +396,8 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
pExport->AddAttribute(sAttrValType, XML_PERCENTAGE);
bWasSetTypeAttribute = true;
}
- } // No Break
+ SAL_FALLTHROUGH;
+ }
case util::NumberFormat::CURRENCY:
{
if (!bWasSetTypeAttribute)