summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlgrin.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 /sw/source/filter/html/htmlgrin.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 'sw/source/filter/html/htmlgrin.cxx')
-rw-r--r--sw/source/filter/html/htmlgrin.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 7a1607974ec9..c7c600e3e5a5 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -390,21 +390,21 @@ void SwHTMLParser::InsertImage()
case HTML_O_SDONLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONLOAD:
nEvent = SVX_EVENT_IMAGE_LOAD;
goto IMAGE_SETEVENT;
case HTML_O_SDONABORT:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONABORT:
nEvent = SVX_EVENT_IMAGE_ABORT;
goto IMAGE_SETEVENT;
case HTML_O_SDONERROR:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONERROR:
nEvent = SVX_EVENT_IMAGE_ERROR;
goto IMAGE_SETEVENT;
@@ -874,7 +874,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONLOAD:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC );
bSetEvent = true;
@@ -882,7 +882,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONUNLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONUNLOAD:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::PREPARECLOSEDOC );
bSetEvent = true;
@@ -890,7 +890,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::ACTIVATEDOC );
bSetEvent = true;
@@ -898,7 +898,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONBLUR:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::DEACTIVATEDOC );
bSetEvent = true;
@@ -1118,21 +1118,21 @@ void SwHTMLParser::NewAnchor()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = SFX_EVENT_MOUSECLICK_OBJECT;
goto ANCHOR_SETEVENT;
case HTML_O_SDONMOUSEOVER:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONMOUSEOVER:
nEvent = SFX_EVENT_MOUSEOVER_OBJECT;
goto ANCHOR_SETEVENT;
case HTML_O_SDONMOUSEOUT:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONMOUSEOUT:
nEvent = SFX_EVENT_MOUSEOUT_OBJECT;
goto ANCHOR_SETEVENT;