summaryrefslogtreecommitdiff
path: root/extensions
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 /extensions
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 'extensions')
-rw-r--r--extensions/source/abpilot/abspilot.cxx2
-rw-r--r--extensions/source/bibliography/datman.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
7 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 76ba86ef3019..fb357839a390 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -246,7 +246,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/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 844c0cc0bbc4..0ec1fe2daa9f 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -709,7 +709,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
case DataType::CHAR:
case DataType::CLOB:
bFormattedIsNumeric = false;
- // _NO_ break !
+ SAL_FALLTHROUGH;
default:
sCurrentModelType = "FormattedField";
bIsFormatted = true;
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index dfce9d77709a..075b3f1ebcfc 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 d7daaedbc8fd..29ba124e0626 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 fdfb3a53b01f..4f32e2019280 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1554,7 +1554,7 @@ namespace pcr
// Command also depends on DataSource
aDependentProperties.push_back( PROPERTY_ID_COMMAND );
- // NO break!
+ SAL_FALLTHROUGH;
// ----- Command -----
case PROPERTY_ID_COMMAND:
@@ -1571,7 +1571,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:
@@ -1676,8 +1676,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 996ec0105987..fda8276fbdb0 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -450,7 +450,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 ee9bce1acc9e..ad612c58ae07 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;