summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-10 16:42:16 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:26:06 -0400
commite7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f (patch)
treea6c39d9d4cde1baa84a9d788affbce3508af89a8 /reportdesign
parent34f591ca95c4c63be092da4c4b2294230404f336 (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. (cherry picked from commit 14cd5182c5f64c43581c82db8c958369152226ac) Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx2
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx8
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 998428070dc9..029b453d8c53 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -600,7 +600,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
// TODO/LATER: no way to transport the error outside from the filter!
break;
}
- // fall through intended
+ SAL_FALLTHROUGH;
default:
{
// TODO/LATER: this is completely wrong! Filter code should never call ErrorHandler directly! But for now this is the only way!
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 990277a36f78..fd6a1720da56 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -752,7 +752,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
break;
}
}
- // run through
+ SAL_FALLTHROUGH;
}
default:
EditBrowseBox::Command(rEvt);
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 47a6d4ede761..6b24e4f942c3 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -974,7 +974,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
aPropertyValue <<= static_cast<sal_Int32>(COL_TRANSPARENT);
break;
}
- // run through
+ SAL_FALLTHROUGH;
case PROPERTY_ID_KEEPTOGETHER:
if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
@@ -982,7 +982,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
aPropertyValue = getConstantValue(false,RID_STR_KEEPTOGETHER_CONST,_rControlValue,"com.sun.star.report.KeepTogether",PropertyName);
break;
}
- // run through
+ SAL_FALLTHROUGH;
case PROPERTY_ID_VISIBLE:
case PROPERTY_ID_CANGROW:
@@ -1138,7 +1138,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
aControlValue = getConstantValue(true,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,"com.sun.star.report.KeepTogether",PropertyName);
break;
}
- // run through
+ SAL_FALLTHROUGH;
case PROPERTY_ID_VISIBLE:
case PROPERTY_ID_CANGROW:
case PROPERTY_ID_CANSHRINK:
@@ -1244,7 +1244,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
if ( (aPropertyValue >>= nColor) && static_cast<sal_Int32>(COL_TRANSPARENT) == nColor )
aPropertyValue.clear();
}
- // run through
+ SAL_FALLTHROUGH;
default:
aControlValue = m_xFormComponentHandler->convertToControlValue(PropertyName, aPropertyValue, _rControlValueType);
}
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index a8f7cede94d1..43b0c368a2a8 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -363,7 +363,7 @@ bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
bReturn = true;
break;
}
- // run through
+ SAL_FALLTHROUGH;
default:
{
bReturn = m_rView.KeyInput(_rEvent, m_pParent);