summaryrefslogtreecommitdiffstats
path: root/extensions
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 /extensions
parentdesktop: warning C4101 unreferenced local variable (diff)
downloadcore-e7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f.tar.gz
core-e7b11300cd813f821d1ec5cb4633ce2c5f7d1b9f.zip
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 'extensions')
-rw-r--r--extensions/source/abpilot/abspilot.cxx2
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx2
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx6
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx2
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx2
6 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 7e978e435a74..ace7b9a9de59 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -250,7 +250,7 @@ namespace abp
implCreateDataSource();
if ( needAdminInvokationPage() )
break;
- // no break here
+ SAL_FALLTHROUGH;
case STATE_INVOKE_ADMIN_DIALOG:
if ( !connectToDataSource( false ) )
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 53ce924cf45f..6f74be887141 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -164,7 +164,7 @@ namespace pcr
break;
}
}
- // NO break here!
+ SAL_FALLTHROUGH;
}
case FormComponentType::LISTBOX:
case FormComponentType::COMBOBOX:
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index d4870a456f99..4bccf525bff8 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -572,8 +572,8 @@ namespace pcr
bool bBoundToSomeModel = !sDataModelName.isEmpty();
_rxInspectorUI->rebuildPropertyUI( PROPERTY_BINDING_NAME );
_rxInspectorUI->enablePropertyUI( PROPERTY_BINDING_NAME, bBoundToSomeModel );
+ SAL_FALLTHROUGH;
}
- // NO break
case PROPERTY_ID_BINDING_NAME:
{
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index f805cac7276f..2a021f05dc74 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1555,7 +1555,7 @@ namespace pcr
// Command also depends on DataSource
aDependentProperties.push_back( PROPERTY_ID_COMMAND );
- // NO break!
+ SAL_FALLTHROUGH;
// ----- Command -----
case PROPERTY_ID_COMMAND:
@@ -1572,7 +1572,7 @@ namespace pcr
_rxInspectorUI->rebuildPropertyUI( PROPERTY_LISTSOURCE );
aDependentProperties.push_back( PROPERTY_ID_STRINGITEMLIST );
aDependentProperties.push_back( PROPERTY_ID_BOUNDCOLUMN );
- // NO break!
+ SAL_FALLTHROUGH;
// ----- StringItemList -----
case PROPERTY_ID_STRINGITEMLIST:
@@ -1677,8 +1677,8 @@ namespace pcr
FormButtonType eButtonType( FormButtonType_PUSH );
OSL_VERIFY( _rNewValue >>= eButtonType );
_rxInspectorUI->enablePropertyUI( PROPERTY_TARGET_URL, FormButtonType_URL == eButtonType );
+ SAL_FALLTHROUGH;
}
- // NO break!
// ----- TargetURL -----
case PROPERTY_ID_TARGET_URL:
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 961b6bc18763..de5f935fb73f 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -453,7 +453,7 @@ namespace pcr
case PROPERTY_ID_WIDTH:
case PROPERTY_ID_HEIGHT:
bIsSize = true;
- // NO break!
+ SAL_FALLTHROUGH;
case PROPERTY_ID_POSITIONX:
case PROPERTY_ID_POSITIONY:
{
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index cb1d20590c22..74488936da24 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -99,7 +99,7 @@ namespace pcr
default:
OSL_FAIL( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" );
- // NO break!
+ SAL_FALLTHROUGH;
case TypeClass_STRING:
nControlType = PropertyControlType::TextField;