anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 02:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mark some intentional fall-throughs (in a way understandable to gcc)

Browse Source 
This silences -Wimplicit-fallthrough warnings with gcc7.
This commit is contained in:
Juergen Spitzmueller 2017-11-10 13:07:00 +01:00
parent 3628ceec48
commit 9235d5299e
12 changed files with 171 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Buffer.cpp
View File

@ -4795,8 +4795,10 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
switch (par.itemdepth) { switch (par.itemdepth) {
case 2: case 2:
enumcounter += 'i'; enumcounter += 'i';
// fall through
case 1: case 1:
enumcounter += 'i'; enumcounter += 'i';
// fall through
case 0: case 0:
enumcounter += 'i'; enumcounter += 'i';
break; break;

160
src/LyXRC.cpp
View File

@ -1313,7 +1313,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_DEFFILE: case RC_DEFFILE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
def_file != system_lyxrc.def_file) { def_file != system_lyxrc.def_file) {
@ -1330,7 +1330,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# MISC SECTION ######################################\n" << "# MISC SECTION ######################################\n"
<< "#\n\n"; << "#\n\n";
// bind files are not done here. // bind files are not done here.
// fall through
case RC_PATH_PREFIX: case RC_PATH_PREFIX:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
path_prefix != system_lyxrc.path_prefix) { path_prefix != system_lyxrc.path_prefix) {
@ -1338,6 +1338,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_UIFILE: case RC_UIFILE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
ui_file != system_lyxrc.ui_file) { ui_file != system_lyxrc.ui_file) {
@ -1346,6 +1347,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_AUTOREGIONDELETE: case RC_AUTOREGIONDELETE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
auto_region_delete != system_lyxrc.auto_region_delete) { auto_region_delete != system_lyxrc.auto_region_delete) {
@ -1356,6 +1358,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_AUTORESET_OPTIONS: case RC_AUTORESET_OPTIONS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
auto_reset_options != system_lyxrc.auto_reset_options) { auto_reset_options != system_lyxrc.auto_reset_options) {
@ -1367,6 +1370,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_AUTOSAVE: case RC_AUTOSAVE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
autosave != system_lyxrc.autosave) { autosave != system_lyxrc.autosave) {
@ -1375,6 +1379,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_DISPLAY_GRAPHICS: case RC_DISPLAY_GRAPHICS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
display_graphics != system_lyxrc.display_graphics) { display_graphics != system_lyxrc.display_graphics) {
@ -1386,6 +1391,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SORT_LAYOUTS: case RC_SORT_LAYOUTS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
sort_layouts != system_lyxrc.sort_layouts) { sort_layouts != system_lyxrc.sort_layouts) {
@ -1394,6 +1400,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_GROUP_LAYOUTS: case RC_GROUP_LAYOUTS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
group_layouts != system_lyxrc.group_layouts) { group_layouts != system_lyxrc.group_layouts) {
@ -1402,6 +1409,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_VIEWDVI_PAPEROPTION: case RC_VIEWDVI_PAPEROPTION:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
view_dvi_paper_option view_dvi_paper_option
@ -1413,6 +1421,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_CHKTEX_COMMAND: case RC_CHKTEX_COMMAND:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
chktex_command != system_lyxrc.chktex_command) { chktex_command != system_lyxrc.chktex_command) {
@ -1420,6 +1429,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_BIBTEX_ALTERNATIVES: { case RC_BIBTEX_ALTERNATIVES: {
CommandSet::const_iterator it = bibtex_alternatives.begin(); CommandSet::const_iterator it = bibtex_alternatives.begin();
CommandSet::const_iterator end = bibtex_alternatives.end(); CommandSet::const_iterator end = bibtex_alternatives.end();
@ -1432,6 +1442,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
} }
// fall through
case RC_BIBTEX_COMMAND: case RC_BIBTEX_COMMAND:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
bibtex_command != system_lyxrc.bibtex_command) { bibtex_command != system_lyxrc.bibtex_command) {
@ -1439,6 +1450,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_JBIBTEX_COMMAND: case RC_JBIBTEX_COMMAND:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
jbibtex_command != system_lyxrc.jbibtex_command) { jbibtex_command != system_lyxrc.jbibtex_command) {
@ -1446,6 +1458,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_INDEX_ALTERNATIVES: { case RC_INDEX_ALTERNATIVES: {
CommandSet::const_iterator it = index_alternatives.begin(); CommandSet::const_iterator it = index_alternatives.begin();
CommandSet::const_iterator end = index_alternatives.end(); CommandSet::const_iterator end = index_alternatives.end();
@ -1458,6 +1471,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
} }
// fall through
case RC_INDEX_COMMAND: case RC_INDEX_COMMAND:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
index_command != system_lyxrc.index_command) { index_command != system_lyxrc.index_command) {
@ -1465,6 +1479,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_JINDEX_COMMAND: case RC_JINDEX_COMMAND:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
jindex_command != system_lyxrc.jindex_command) { jindex_command != system_lyxrc.jindex_command) {
@ -1472,6 +1487,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SPLITINDEX_COMMAND: case RC_SPLITINDEX_COMMAND:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
splitindex_command != system_lyxrc.splitindex_command) { splitindex_command != system_lyxrc.splitindex_command) {
@ -1479,6 +1495,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_NOMENCL_COMMAND: case RC_NOMENCL_COMMAND:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
nomencl_command != system_lyxrc.nomencl_command) { nomencl_command != system_lyxrc.nomencl_command) {
@ -1486,6 +1503,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_TEX_EXPECTS_WINDOWS_PATHS: case RC_TEX_EXPECTS_WINDOWS_PATHS:
// Don't write this setting to the preferences file, // Don't write this setting to the preferences file,
// but allow temporary changes (bug 7557). // but allow temporary changes (bug 7557).
@ -1495,6 +1513,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_TEX_ALLOWS_SPACES: case RC_TEX_ALLOWS_SPACES:
if (tex_allows_spaces != system_lyxrc.tex_allows_spaces) { if (tex_allows_spaces != system_lyxrc.tex_allows_spaces) {
os << "\\tex_allows_spaces " os << "\\tex_allows_spaces "
@ -1502,6 +1521,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_KBMAP: case RC_KBMAP:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_kbmap != system_lyxrc.use_kbmap) { use_kbmap != system_lyxrc.use_kbmap) {
@ -1509,6 +1529,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_KBMAP_PRIMARY: case RC_KBMAP_PRIMARY:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
primary_kbmap != system_lyxrc.primary_kbmap) { primary_kbmap != system_lyxrc.primary_kbmap) {
@ -1517,6 +1538,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_KBMAP_SECONDARY: case RC_KBMAP_SECONDARY:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
secondary_kbmap != system_lyxrc.secondary_kbmap) { secondary_kbmap != system_lyxrc.secondary_kbmap) {
@ -1525,6 +1547,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SERVERPIPE: case RC_SERVERPIPE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
lyxpipes != system_lyxrc.lyxpipes) { lyxpipes != system_lyxrc.lyxpipes) {
@ -1533,6 +1556,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_DATE_INSERT_FORMAT: case RC_DATE_INSERT_FORMAT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
date_insert_format != system_lyxrc.date_insert_format) { date_insert_format != system_lyxrc.date_insert_format) {
@ -1541,17 +1565,17 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USER_NAME: case RC_USER_NAME:
os << "\\user_name \"" << user_name << "\"\n"; os << "\\user_name \"" << user_name << "\"\n";
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USER_EMAIL: case RC_USER_EMAIL:
os << "\\user_email \"" << user_email << "\"\n"; os << "\\user_email \"" << user_email << "\"\n";
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SHOW_BANNER: case RC_SHOW_BANNER:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
show_banner != system_lyxrc.show_banner) { show_banner != system_lyxrc.show_banner) {
@ -1559,7 +1583,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_PREVIEW: case RC_PREVIEW:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
preview != system_lyxrc.preview) { preview != system_lyxrc.preview) {
@ -1579,7 +1603,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_PREVIEW_HASHED_LABELS: case RC_PREVIEW_HASHED_LABELS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
preview_hashed_labels != preview_hashed_labels !=
@ -1589,7 +1613,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_PREVIEW_SCALE_FACTOR: case RC_PREVIEW_SCALE_FACTOR:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
preview_scale_factor != system_lyxrc.preview_scale_factor) { preview_scale_factor != system_lyxrc.preview_scale_factor) {
@ -1598,7 +1622,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USE_CONVERTER_CACHE: case RC_USE_CONVERTER_CACHE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_converter_cache != system_lyxrc.use_converter_cache) { use_converter_cache != system_lyxrc.use_converter_cache) {
@ -1608,6 +1632,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_CONVERTER_CACHE_MAXAGE: case RC_CONVERTER_CACHE_MAXAGE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
converter_cache_maxage != system_lyxrc.converter_cache_maxage) { converter_cache_maxage != system_lyxrc.converter_cache_maxage) {
@ -1620,7 +1645,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
os << "\n#\n" os << "\n#\n"
<< "# SCREEN & FONTS SECTION ############################\n" << "# SCREEN & FONTS SECTION ############################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_ICON_SET: case RC_ICON_SET:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
icon_set != system_lyxrc.icon_set) { icon_set != system_lyxrc.icon_set) {
@ -1629,7 +1654,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USE_SYSTEM_THEME_ICONS: case RC_USE_SYSTEM_THEME_ICONS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_system_theme_icons != system_lyxrc.use_system_theme_icons) { use_system_theme_icons != system_lyxrc.use_system_theme_icons) {
@ -1639,7 +1664,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_DPI: case RC_SCREEN_DPI:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
dpi != system_lyxrc.dpi) { dpi != system_lyxrc.dpi) {
@ -1647,6 +1672,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_ZOOM: case RC_SCREEN_ZOOM:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
zoom != system_lyxrc.zoom) { zoom != system_lyxrc.zoom) {
@ -1654,6 +1680,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_GEOMETRY_SESSION: case RC_GEOMETRY_SESSION:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
allow_geometry_session != system_lyxrc.allow_geometry_session) { allow_geometry_session != system_lyxrc.allow_geometry_session) {
@ -1662,6 +1689,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_CURSOR_FOLLOWS_SCROLLBAR: case RC_CURSOR_FOLLOWS_SCROLLBAR:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
cursor_follows_scrollbar cursor_follows_scrollbar
@ -1671,6 +1699,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_CURSOR_WIDTH: case RC_CURSOR_WIDTH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
cursor_width cursor_width
@ -1680,6 +1709,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCROLL_BELOW_DOCUMENT: case RC_SCROLL_BELOW_DOCUMENT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
scroll_below_document scroll_below_document
@ -1689,6 +1719,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_PARAGRAPH_MARKERS: case RC_PARAGRAPH_MARKERS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
paragraph_markers paragraph_markers
@ -1698,6 +1729,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_MAC_DONTSWAP_CTRL_META: case RC_MAC_DONTSWAP_CTRL_META:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
mac_dontswap_ctrl_meta mac_dontswap_ctrl_meta
@ -1707,6 +1739,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_MAC_LIKE_CURSOR_MOVEMENT: case RC_MAC_LIKE_CURSOR_MOVEMENT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
mac_like_cursor_movement mac_like_cursor_movement
@ -1716,6 +1749,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_MACRO_EDIT_STYLE: case RC_MACRO_EDIT_STYLE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
macro_edit_style macro_edit_style
@ -1729,6 +1763,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_DIALOGS_ICONIFY_WITH_MAIN: case RC_DIALOGS_ICONIFY_WITH_MAIN:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
dialogs_iconify_with_main dialogs_iconify_with_main
@ -1738,6 +1773,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_FONT_ROMAN: case RC_SCREEN_FONT_ROMAN:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
roman_font_name != system_lyxrc.roman_font_name) { roman_font_name != system_lyxrc.roman_font_name) {
@ -1746,6 +1782,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_FONT_ROMAN_FOUNDRY: case RC_SCREEN_FONT_ROMAN_FOUNDRY:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
roman_font_foundry != system_lyxrc.roman_font_foundry) { roman_font_foundry != system_lyxrc.roman_font_foundry) {
@ -1754,6 +1791,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_FONT_SANS: case RC_SCREEN_FONT_SANS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
sans_font_name != system_lyxrc.sans_font_name) { sans_font_name != system_lyxrc.sans_font_name) {
@ -1762,6 +1800,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_FONT_SANS_FOUNDRY: case RC_SCREEN_FONT_SANS_FOUNDRY:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
sans_font_foundry != system_lyxrc.sans_font_foundry) { sans_font_foundry != system_lyxrc.sans_font_foundry) {
@ -1770,6 +1809,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_FONT_TYPEWRITER: case RC_SCREEN_FONT_TYPEWRITER:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
typewriter_font_name != system_lyxrc.typewriter_font_name) { typewriter_font_name != system_lyxrc.typewriter_font_name) {
@ -1778,6 +1818,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY: case RC_SCREEN_FONT_TYPEWRITER_FOUNDRY:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
typewriter_font_foundry != system_lyxrc.typewriter_font_foundry) { typewriter_font_foundry != system_lyxrc.typewriter_font_foundry) {
@ -1786,7 +1827,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_FONT_SCALABLE: case RC_SCREEN_FONT_SCALABLE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_scalable_fonts != system_lyxrc.use_scalable_fonts) { use_scalable_fonts != system_lyxrc.use_scalable_fonts) {
@ -1796,6 +1837,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCREEN_FONT_SIZES: case RC_SCREEN_FONT_SIZES:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
font_sizes[FONT_SIZE_TINY] font_sizes[FONT_SIZE_TINY]
@ -1838,6 +1880,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FULL_SCREEN_LIMIT: case RC_FULL_SCREEN_LIMIT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
full_screen_limit != system_lyxrc.full_screen_limit) { full_screen_limit != system_lyxrc.full_screen_limit) {
@ -1847,6 +1890,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FULL_SCREEN_TOOLBARS: case RC_FULL_SCREEN_TOOLBARS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
full_screen_toolbars != system_lyxrc.full_screen_toolbars) { full_screen_toolbars != system_lyxrc.full_screen_toolbars) {
@ -1856,6 +1900,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FULL_SCREEN_SCROLLBAR: case RC_FULL_SCREEN_SCROLLBAR:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
full_screen_scrollbar != system_lyxrc.full_screen_scrollbar) { full_screen_scrollbar != system_lyxrc.full_screen_scrollbar) {
@ -1865,6 +1910,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FULL_SCREEN_STATUSBAR: case RC_FULL_SCREEN_STATUSBAR:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
full_screen_statusbar != system_lyxrc.full_screen_statusbar) { full_screen_statusbar != system_lyxrc.full_screen_statusbar) {
@ -1874,6 +1920,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FULL_SCREEN_TABBAR: case RC_FULL_SCREEN_TABBAR:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
full_screen_tabbar != system_lyxrc.full_screen_tabbar) { full_screen_tabbar != system_lyxrc.full_screen_tabbar) {
@ -1883,6 +1930,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FULL_SCREEN_MENUBAR: case RC_FULL_SCREEN_MENUBAR:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
full_screen_menubar != system_lyxrc.full_screen_menubar) { full_screen_menubar != system_lyxrc.full_screen_menubar) {
@ -1892,6 +1940,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FULL_SCREEN_WIDTH: case RC_FULL_SCREEN_WIDTH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
full_screen_width != system_lyxrc.full_screen_width) { full_screen_width != system_lyxrc.full_screen_width) {
@ -1901,6 +1950,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_OPEN_BUFFERS_IN_TABS: case RC_OPEN_BUFFERS_IN_TABS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
open_buffers_in_tabs != system_lyxrc.open_buffers_in_tabs) { open_buffers_in_tabs != system_lyxrc.open_buffers_in_tabs) {
@ -1910,6 +1960,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SINGLE_CLOSE_TAB_BUTTON: case RC_SINGLE_CLOSE_TAB_BUTTON:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
single_close_tab_button != system_lyxrc.single_close_tab_button) { single_close_tab_button != system_lyxrc.single_close_tab_button) {
@ -1919,6 +1970,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SINGLE_INSTANCE: case RC_SINGLE_INSTANCE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
single_instance != system_lyxrc.single_instance) { single_instance != system_lyxrc.single_instance) {
@ -1928,6 +1980,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FORWARD_SEARCH_DVI: case RC_FORWARD_SEARCH_DVI:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
forward_search_dvi != system_lyxrc.forward_search_dvi) { forward_search_dvi != system_lyxrc.forward_search_dvi) {
@ -1935,6 +1988,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FORWARD_SEARCH_PDF: case RC_FORWARD_SEARCH_PDF:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
forward_search_pdf != system_lyxrc.forward_search_pdf) { forward_search_pdf != system_lyxrc.forward_search_pdf) {
@ -1947,6 +2001,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# COLOR SECTION ###################################\n" << "# COLOR SECTION ###################################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_SET_COLOR: case RC_SET_COLOR:
for (int i = 0; i < Color_ignore; ++i) { for (int i = 0; i < Color_ignore; ++i) {
ColorCode lc = static_cast<ColorCode>(i); ColorCode lc = static_cast<ColorCode>(i);
@ -1965,6 +2020,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# PRINTER SECTION ###################################\n" << "# PRINTER SECTION ###################################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_PRINTLANDSCAPEFLAG: case RC_PRINTLANDSCAPEFLAG:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
print_landscape_flag != system_lyxrc.print_landscape_flag) { print_landscape_flag != system_lyxrc.print_landscape_flag) {
@ -1973,7 +2029,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_PRINTPAPERFLAG: case RC_PRINTPAPERFLAG:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
print_paper_flag != system_lyxrc.print_paper_flag) { print_paper_flag != system_lyxrc.print_paper_flag) {
@ -1982,7 +2038,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_PRINTPAPERDIMENSIONFLAG: case RC_PRINTPAPERDIMENSIONFLAG:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
print_paper_dimension_flag print_paper_dimension_flag
@ -1997,6 +2053,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# TEX SECTION #######################################\n" << "# TEX SECTION #######################################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_TEXINPUTS_PREFIX: case RC_TEXINPUTS_PREFIX:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
texinputs_prefix != system_lyxrc.texinputs_prefix) { texinputs_prefix != system_lyxrc.texinputs_prefix) {
@ -2004,7 +2061,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_FONT_ENCODING: case RC_FONT_ENCODING:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
fontenc != system_lyxrc.fontenc) { fontenc != system_lyxrc.fontenc) {
@ -2017,6 +2074,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# FILE SECTION ######################################\n" << "# FILE SECTION ######################################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_DOCUMENTPATH: case RC_DOCUMENTPATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
document_path != system_lyxrc.document_path) { document_path != system_lyxrc.document_path) {
@ -2025,6 +2083,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USELASTFILEPOS: case RC_USELASTFILEPOS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_lastfilepos != system_lyxrc.use_lastfilepos) { use_lastfilepos != system_lyxrc.use_lastfilepos) {
@ -2033,6 +2092,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LOADSESSION: case RC_LOADSESSION:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
load_session != system_lyxrc.load_session) { load_session != system_lyxrc.load_session) {
@ -2041,6 +2101,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_MOUSE_WHEEL_SPEED: case RC_MOUSE_WHEEL_SPEED:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
mouse_wheel_speed != system_lyxrc.mouse_wheel_speed) { mouse_wheel_speed != system_lyxrc.mouse_wheel_speed) {
@ -2048,6 +2109,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_MOUSE_MIDDLEBUTTON_PASTE: case RC_MOUSE_MIDDLEBUTTON_PASTE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
mouse_middlebutton_paste != system_lyxrc.mouse_middlebutton_paste) { mouse_middlebutton_paste != system_lyxrc.mouse_middlebutton_paste) {
@ -2056,6 +2118,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_INLINE_DELAY: case RC_COMPLETION_INLINE_DELAY:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_inline_delay != system_lyxrc.completion_inline_delay) { completion_inline_delay != system_lyxrc.completion_inline_delay) {
@ -2063,6 +2126,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_INLINE_MATH: case RC_COMPLETION_INLINE_MATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_inline_math != system_lyxrc.completion_inline_math) { completion_inline_math != system_lyxrc.completion_inline_math) {
@ -2071,6 +2135,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_INLINE_TEXT: case RC_COMPLETION_INLINE_TEXT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_inline_text != system_lyxrc.completion_inline_text) { completion_inline_text != system_lyxrc.completion_inline_text) {
@ -2079,6 +2144,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_INLINE_DOTS: case RC_COMPLETION_INLINE_DOTS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_inline_dots != system_lyxrc.completion_inline_dots) { completion_inline_dots != system_lyxrc.completion_inline_dots) {
@ -2087,6 +2153,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_AUTOCORRECTION_MATH: case RC_AUTOCORRECTION_MATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
autocorrection_math != system_lyxrc.autocorrection_math) { autocorrection_math != system_lyxrc.autocorrection_math) {
@ -2095,6 +2162,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_POPUP_DELAY: case RC_COMPLETION_POPUP_DELAY:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_popup_delay != system_lyxrc.completion_popup_delay) { completion_popup_delay != system_lyxrc.completion_popup_delay) {
@ -2102,6 +2170,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_POPUP_MATH: case RC_COMPLETION_POPUP_MATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_popup_math != system_lyxrc.completion_popup_math) { completion_popup_math != system_lyxrc.completion_popup_math) {
@ -2110,6 +2179,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_POPUP_TEXT: case RC_COMPLETION_POPUP_TEXT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_popup_text != system_lyxrc.completion_popup_text) { completion_popup_text != system_lyxrc.completion_popup_text) {
@ -2118,6 +2188,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_CURSOR_TEXT: case RC_COMPLETION_CURSOR_TEXT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_cursor_text != system_lyxrc.completion_cursor_text) { completion_cursor_text != system_lyxrc.completion_cursor_text) {
@ -2126,6 +2197,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_POPUP_AFTER_COMPLETE: case RC_COMPLETION_POPUP_AFTER_COMPLETE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_popup_after_complete completion_popup_after_complete
@ -2135,6 +2207,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COMPLETION_MINLENGTH: case RC_COMPLETION_MINLENGTH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
completion_minlength != system_lyxrc.completion_minlength) { completion_minlength != system_lyxrc.completion_minlength) {
@ -2143,7 +2216,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_NUMLASTFILES: case RC_NUMLASTFILES:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
num_lastfiles != system_lyxrc.num_lastfiles) { num_lastfiles != system_lyxrc.num_lastfiles) {
@ -2151,6 +2224,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_CHECKLASTFILES: case RC_CHECKLASTFILES:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
check_lastfiles != system_lyxrc.check_lastfiles) { check_lastfiles != system_lyxrc.check_lastfiles) {
@ -2159,6 +2233,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_EXAMPLEPATH: case RC_EXAMPLEPATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
example_path != system_lyxrc.example_path) { example_path != system_lyxrc.example_path) {
@ -2167,6 +2242,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_TEMPLATEPATH: case RC_TEMPLATEPATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
template_path != system_lyxrc.template_path) { template_path != system_lyxrc.template_path) {
@ -2175,6 +2251,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_TEMPDIRPATH: case RC_TEMPDIRPATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
tempdir_path != system_lyxrc.tempdir_path) { tempdir_path != system_lyxrc.tempdir_path) {
@ -2183,6 +2260,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_THESAURUSDIRPATH: case RC_THESAURUSDIRPATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
thesaurusdir_path != system_lyxrc.thesaurusdir_path) { thesaurusdir_path != system_lyxrc.thesaurusdir_path) {
@ -2191,6 +2269,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_HUNSPELLDIR_PATH: case RC_HUNSPELLDIR_PATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
hunspelldir_path != system_lyxrc.hunspelldir_path) { hunspelldir_path != system_lyxrc.hunspelldir_path) {
@ -2199,6 +2278,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_PLAINTEXT_LINELEN: case RC_PLAINTEXT_LINELEN:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
plaintext_linelen != system_lyxrc.plaintext_linelen) { plaintext_linelen != system_lyxrc.plaintext_linelen) {
@ -2206,6 +2286,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_MAKE_BACKUP: case RC_MAKE_BACKUP:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
make_backup != system_lyxrc.make_backup) { make_backup != system_lyxrc.make_backup) {
@ -2213,6 +2294,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SAVE_COMPRESSED: case RC_SAVE_COMPRESSED:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
save_compressed != system_lyxrc.save_compressed) { save_compressed != system_lyxrc.save_compressed) {
@ -2220,6 +2302,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SAVE_ORIGIN: case RC_SAVE_ORIGIN:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
save_origin != system_lyxrc.save_origin) { save_origin != system_lyxrc.save_origin) {
@ -2227,6 +2310,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_BACKUPDIR_PATH: case RC_BACKUPDIR_PATH:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
backupdir_path != system_lyxrc.backupdir_path) { backupdir_path != system_lyxrc.backupdir_path) {
@ -2244,6 +2328,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# SPELLCHECKER SECTION ##############################\n" << "# SPELLCHECKER SECTION ##############################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_ACCEPT_COMPOUND: case RC_ACCEPT_COMPOUND:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
spellchecker_accept_compound != system_lyxrc.spellchecker_accept_compound) { spellchecker_accept_compound != system_lyxrc.spellchecker_accept_compound) {
@ -2252,6 +2337,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_ALT_LANG: case RC_ALT_LANG:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
spellchecker_alt_lang != system_lyxrc.spellchecker_alt_lang) { spellchecker_alt_lang != system_lyxrc.spellchecker_alt_lang) {
@ -2260,6 +2346,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_ESC_CHARS: case RC_ESC_CHARS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
spellchecker_esc_chars != system_lyxrc.spellchecker_esc_chars) { spellchecker_esc_chars != system_lyxrc.spellchecker_esc_chars) {
@ -2267,6 +2354,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USE_SYSTEM_COLORS: case RC_USE_SYSTEM_COLORS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_system_colors != system_lyxrc.use_system_colors) { use_system_colors != system_lyxrc.use_system_colors) {
@ -2276,6 +2364,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USE_TOOLTIP: case RC_USE_TOOLTIP:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_tooltip != system_lyxrc.use_tooltip) { use_tooltip != system_lyxrc.use_tooltip) {
@ -2285,6 +2374,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USE_PIXMAP_CACHE: case RC_USE_PIXMAP_CACHE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_pixmap_cache != system_lyxrc.use_pixmap_cache) { use_pixmap_cache != system_lyxrc.use_pixmap_cache) {
@ -2294,6 +2384,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_USE_QIMAGE: case RC_USE_QIMAGE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
use_qimage != system_lyxrc.use_qimage) { use_qimage != system_lyxrc.use_qimage) {
@ -2308,6 +2399,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# LANGUAGE SUPPORT SECTION ##########################\n" << "# LANGUAGE SUPPORT SECTION ##########################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_DEFAULT_DECIMAL_POINT: case RC_DEFAULT_DECIMAL_POINT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
default_decimal_point != system_lyxrc.default_decimal_point) { default_decimal_point != system_lyxrc.default_decimal_point) {
@ -2315,7 +2407,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_DEFAULT_LENGTH_UNIT: case RC_DEFAULT_LENGTH_UNIT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
default_length_unit != system_lyxrc.default_length_unit) { default_length_unit != system_lyxrc.default_length_unit) {
@ -2323,7 +2415,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SPELLCHECKER: case RC_SPELLCHECKER:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
spellchecker != system_lyxrc.spellchecker) { spellchecker != system_lyxrc.spellchecker) {
@ -2331,7 +2423,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SPELLCHECK_CONTINUOUSLY: case RC_SPELLCHECK_CONTINUOUSLY:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
spellcheck_continuously != system_lyxrc.spellcheck_continuously) { spellcheck_continuously != system_lyxrc.spellcheck_continuously) {
@ -2340,7 +2432,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SPELLCHECK_NOTES: case RC_SPELLCHECK_NOTES:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
spellcheck_notes != system_lyxrc.spellcheck_notes) { spellcheck_notes != system_lyxrc.spellcheck_notes) {
@ -2349,7 +2441,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_VISUAL_CURSOR: case RC_VISUAL_CURSOR:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
visual_cursor != system_lyxrc.visual_cursor) { visual_cursor != system_lyxrc.visual_cursor) {
@ -2357,6 +2449,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_CLOSE_BUFFER_WITH_LAST_VIEW: case RC_CLOSE_BUFFER_WITH_LAST_VIEW:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
close_buffer_with_last_view != system_lyxrc.close_buffer_with_last_view) { close_buffer_with_last_view != system_lyxrc.close_buffer_with_last_view) {
@ -2365,6 +2458,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LANGUAGE_CUSTOM_PACKAGE: case RC_LANGUAGE_CUSTOM_PACKAGE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
language_custom_package != system_lyxrc.language_custom_package) { language_custom_package != system_lyxrc.language_custom_package) {
@ -2373,6 +2467,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LANGUAGE_GLOBAL_OPTIONS: case RC_LANGUAGE_GLOBAL_OPTIONS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
language_global_options language_global_options
@ -2383,6 +2478,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LANGUAGE_PACKAGE_SELECTION: case RC_LANGUAGE_PACKAGE_SELECTION:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
language_package_selection != system_lyxrc.language_package_selection) { language_package_selection != system_lyxrc.language_package_selection) {
@ -2404,6 +2500,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LANGUAGE_COMMAND_BEGIN: case RC_LANGUAGE_COMMAND_BEGIN:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
language_command_begin language_command_begin
@ -2414,6 +2511,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LANGUAGE_COMMAND_END: case RC_LANGUAGE_COMMAND_END:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
language_command_end language_command_end
@ -2423,6 +2521,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LANGUAGE_COMMAND_LOCAL: case RC_LANGUAGE_COMMAND_LOCAL:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
language_command_local language_command_local
@ -2433,6 +2532,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LANGUAGE_AUTO_BEGIN: case RC_LANGUAGE_AUTO_BEGIN:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
language_auto_begin != system_lyxrc.language_auto_begin) { language_auto_begin != system_lyxrc.language_auto_begin) {
@ -2441,6 +2541,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_LANGUAGE_AUTO_END: case RC_LANGUAGE_AUTO_END:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
language_auto_end != system_lyxrc.language_auto_end) { language_auto_end != system_lyxrc.language_auto_end) {
@ -2449,6 +2550,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_MARK_FOREIGN_LANGUAGE: case RC_MARK_FOREIGN_LANGUAGE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
mark_foreign_language mark_foreign_language
@ -2463,6 +2565,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# 2nd MISC SUPPORT SECTION ##########################\n" << "# 2nd MISC SUPPORT SECTION ##########################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_AUTO_NUMBER: case RC_AUTO_NUMBER:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
auto_number != system_lyxrc.auto_number) { auto_number != system_lyxrc.auto_number) {
@ -2470,6 +2573,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_GUI_LANGUAGE: case RC_GUI_LANGUAGE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
gui_language != system_lyxrc.gui_language) { gui_language != system_lyxrc.gui_language) {
@ -2477,6 +2581,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_EXPORT_OVERWRITE: case RC_EXPORT_OVERWRITE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
export_overwrite != system_lyxrc.export_overwrite) { export_overwrite != system_lyxrc.export_overwrite) {
@ -2496,7 +2601,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_SCROLL_WHEEL_ZOOM: case RC_SCROLL_WHEEL_ZOOM:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
scroll_wheel_zoom != system_lyxrc.scroll_wheel_zoom) { scroll_wheel_zoom != system_lyxrc.scroll_wheel_zoom) {
@ -2524,6 +2629,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# FORMATS SECTION ##########################\n" << "# FORMATS SECTION ##########################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_FILEFORMAT: case RC_FILEFORMAT:
// New/modified formats // New/modified formats
for (Formats::const_iterator cit = formats.begin(); for (Formats::const_iterator cit = formats.begin();
@ -2569,6 +2675,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "\" \"\" \"\" \"\" \"\" \"\" \"\" \"\"\n"; << "\" \"\" \"\" \"\" \"\" \"\" \"\" \"\"\n";
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_VIEWER_ALTERNATIVES: { case RC_VIEWER_ALTERNATIVES: {
Alternatives::const_iterator it = viewer_alternatives.begin(); Alternatives::const_iterator it = viewer_alternatives.begin();
Alternatives::const_iterator const en = viewer_alternatives.end(); Alternatives::const_iterator const en = viewer_alternatives.end();
@ -2594,6 +2701,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
} }
// fall through
case RC_EDITOR_ALTERNATIVES: { case RC_EDITOR_ALTERNATIVES: {
Alternatives::const_iterator it = editor_alternatives.begin(); Alternatives::const_iterator it = editor_alternatives.begin();
Alternatives::const_iterator const en = editor_alternatives.end(); Alternatives::const_iterator const en = editor_alternatives.end();
@ -2619,6 +2727,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
} }
// fall through
case RC_DEFAULT_OTF_VIEW_FORMAT: case RC_DEFAULT_OTF_VIEW_FORMAT:
if ((ignore_system_lyxrc || if ((ignore_system_lyxrc ||
default_otf_view_format != system_lyxrc.default_otf_view_format) default_otf_view_format != system_lyxrc.default_otf_view_format)
@ -2627,6 +2736,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_DEFAULT_VIEW_FORMAT: case RC_DEFAULT_VIEW_FORMAT:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
default_view_format != system_lyxrc.default_view_format) { default_view_format != system_lyxrc.default_view_format) {
@ -2634,6 +2744,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_VIEWER: case RC_VIEWER:
// Ignore it // Ignore it
if (tag != RC_LAST) if (tag != RC_LAST)
@ -2643,6 +2754,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "# CONVERTERS SECTION ##########################\n" << "# CONVERTERS SECTION ##########################\n"
<< "#\n\n"; << "#\n\n";
// fall through
case RC_CONVERTER: case RC_CONVERTER:
// Look for new converters // Look for new converters
for (Converters::const_iterator cit = theConverters().begin(); for (Converters::const_iterator cit = theConverters().begin();
@ -2667,7 +2779,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
<< "\" \"" << cit->to() << "\" \"\" \"\"\n"; << "\" \"" << cit->to() << "\" \"\" \"\"\n";
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
// fall through
case RC_COPIER: case RC_COPIER:
if (tag == RC_LAST) if (tag == RC_LAST)
os << "\n#\n" os << "\n#\n"

4
src/Paragraph.cpp
View File

@ -3823,13 +3823,13 @@ void Paragraph::locateWord(pos_type & from, pos_type & to,
to = from; to = from;
return; return;
} }
// no break here, we go to the next // fall through
case WHOLE_WORD: case WHOLE_WORD:
// If we are already at the beginning of a word, do nothing // If we are already at the beginning of a word, do nothing
if (!from || isWordSeparator(from - 1)) if (!from || isWordSeparator(from - 1))
break; break;
// no break here, we go to the next // fall through
case PREVIOUS_WORD: case PREVIOUS_WORD:
// always move the cursor to the beginning of previous word // always move the cursor to the beginning of previous word

6
src/frontends/qt4/GuiApplication.cpp
View File

@ -2049,9 +2049,8 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
if (current_view_ == 0) if (current_view_ == 0)
createView(); createView();
} }
// fall through
} }
// fall through
default: default:
// The LFUN must be for one of GuiView, BufferView, Buffer or Cursor; // The LFUN must be for one of GuiView, BufferView, Buffer or Cursor;
// let's try that: // let's try that:
@ -2694,7 +2693,8 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
#endif #endif
// In release mode, try to exit gracefully. // In release mode, try to exit gracefully.
this->exit(1); this->exit(1);
// FIXME: GCC 7 thinks we can fall through here. Can we?
// fall through
case BufferException: { case BufferException: {
if (!current_view_ || !current_view_->documentBufferView()) if (!current_view_ || !current_view_->documentBufferView())
return false; return false;

3
src/frontends/qt4/GuiView.cpp
View File

@ -1904,7 +1904,8 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
case LFUN_DIALOG_TOGGLE: case LFUN_DIALOG_TOGGLE:
flag.setOnOff(isDialogVisible(cmd.getArg(0))); flag.setOnOff(isDialogVisible(cmd.getArg(0)));
// fall through to set "enable" // to set "enable"
// fall through
case LFUN_DIALOG_SHOW: { case LFUN_DIALOG_SHOW: {
string const name = cmd.getArg(0); string const name = cmd.getArg(0);
if (!doc_buffer) if (!doc_buffer)

2
src/insets/InsetCaption.cpp
View File

@ -206,6 +206,8 @@ void InsetCaption::doDispatch(Cursor & cur, FuncRequest & cmd)
break; break;
} }
} }
// no "changetype":
// fall through
default: default:
InsetText::doDispatch(cur, cmd); InsetText::doDispatch(cur, cmd);

2
src/insets/InsetFloat.cpp
View File

@ -207,6 +207,8 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
flag.setEnabled(false); flag.setEnabled(false);
return true; return true;
} }
// no subfloat:
// fall through
default: default:
return InsetCaptionable::getStatus(cur, cmd, flag); return InsetCaptionable::getStatus(cur, cmd, flag);

2
src/insets/InsetLabel.cpp
View File

@ -214,6 +214,8 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd,
enabled = false; enabled = false;
break; break;
} }
// no "changetype":
// fall through
default: default:
return InsetCommand::getStatus(cur, cmd, status); return InsetCommand::getStatus(cur, cmd, status);
} }

1
src/insets/InsetListings.cpp
View File

@ -352,6 +352,7 @@ bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd,
return true; return true;
} }
} }
// fall through
default: default:
return InsetCaptionable::getStatus(cur, cmd, status); return InsetCaptionable::getStatus(cur, cmd, status);
} }

15
src/insets/InsetTabular.cpp
View File

@ -4702,12 +4702,14 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
// therefore allow always left but right and center only if there is no width // therefore allow always left but right and center only if there is no width
case Tabular::M_ALIGN_LEFT: case Tabular::M_ALIGN_LEFT:
flag = false; flag = false;
// fall through
case Tabular::ALIGN_LEFT: case Tabular::ALIGN_LEFT:
status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_LEFT); status.setOnOff(tabular.getAlignment(cur.idx(), flag) == LYX_ALIGN_LEFT);
break; break;
case Tabular::M_ALIGN_RIGHT: case Tabular::M_ALIGN_RIGHT:
flag = false; flag = false;
// fall through
case Tabular::ALIGN_RIGHT: case Tabular::ALIGN_RIGHT:
status.setEnabled(!(tabular.isMultiRow(cur.idx()) status.setEnabled(!(tabular.isMultiRow(cur.idx())
&& !tabular.getPWidth(cur.idx()).zero())); && !tabular.getPWidth(cur.idx()).zero()));
@ -4716,6 +4718,7 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
case Tabular::M_ALIGN_CENTER: case Tabular::M_ALIGN_CENTER:
flag = false; flag = false;
// fall through
case Tabular::ALIGN_CENTER: case Tabular::ALIGN_CENTER:
status.setEnabled(!(tabular.isMultiRow(cur.idx()) status.setEnabled(!(tabular.isMultiRow(cur.idx())
&& !tabular.getPWidth(cur.idx()).zero())); && !tabular.getPWidth(cur.idx()).zero()));
@ -4736,6 +4739,7 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
case Tabular::M_VALIGN_TOP: case Tabular::M_VALIGN_TOP:
flag = false; flag = false;
// fall through
case Tabular::VALIGN_TOP: case Tabular::VALIGN_TOP:
status.setEnabled(!tabular.getPWidth(cur.idx()).zero() status.setEnabled(!tabular.getPWidth(cur.idx()).zero()
&& !tabular.isMultiRow(cur.idx())); && !tabular.isMultiRow(cur.idx()));
@ -4745,6 +4749,7 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
case Tabular::M_VALIGN_BOTTOM: case Tabular::M_VALIGN_BOTTOM:
flag = false; flag = false;
// fall through
case Tabular::VALIGN_BOTTOM: case Tabular::VALIGN_BOTTOM:
status.setEnabled(!tabular.getPWidth(cur.idx()).zero() status.setEnabled(!tabular.getPWidth(cur.idx()).zero()
&& !tabular.isMultiRow(cur.idx())); && !tabular.isMultiRow(cur.idx()));
@ -4754,6 +4759,7 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s,
case Tabular::M_VALIGN_MIDDLE: case Tabular::M_VALIGN_MIDDLE:
flag = false; flag = false;
// fall through
case Tabular::VALIGN_MIDDLE: case Tabular::VALIGN_MIDDLE:
status.setEnabled(!tabular.getPWidth(cur.idx()).zero() status.setEnabled(!tabular.getPWidth(cur.idx()).zero()
&& !tabular.isMultiRow(cur.idx())); && !tabular.isMultiRow(cur.idx()));
@ -5032,7 +5038,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
status.setEnabled(false); status.setEnabled(false);
return true; return true;
} }
// Fall back // fall through
case LFUN_NEWLINE_INSERT: { case LFUN_NEWLINE_INSERT: {
if (tabular.getPWidth(cur.idx()).zero()) { if (tabular.getPWidth(cur.idx()).zero()) {
status.setEnabled(false); status.setEnabled(false);
@ -5689,6 +5695,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::M_VALIGN_BOTTOM: case Tabular::M_VALIGN_BOTTOM:
case Tabular::M_VALIGN_MIDDLE: case Tabular::M_VALIGN_MIDDLE:
flag = false; flag = false;
// fall through
case Tabular::VALIGN_TOP: case Tabular::VALIGN_TOP:
case Tabular::VALIGN_BOTTOM: case Tabular::VALIGN_BOTTOM:
case Tabular::VALIGN_MIDDLE: case Tabular::VALIGN_MIDDLE:
@ -5811,6 +5818,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::SET_ALL_LINES: case Tabular::SET_ALL_LINES:
setLines = true; setLines = true;
// fall through
case Tabular::UNSET_ALL_LINES: case Tabular::UNSET_ALL_LINES:
for (row_type r = sel_row_start; r <= sel_row_end; ++r) for (row_type r = sel_row_start; r <= sel_row_end; ++r)
for (col_type c = sel_col_start; c <= sel_col_end; ++c) { for (col_type c = sel_col_start; c <= sel_col_end; ++c) {
@ -5935,6 +5943,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::UNSET_LTFIRSTHEAD: case Tabular::UNSET_LTFIRSTHEAD:
flag = false; flag = false;
// fall through
case Tabular::SET_LTFIRSTHEAD: case Tabular::SET_LTFIRSTHEAD:
tabular.getRowOfLTFirstHead(row, ltt); tabular.getRowOfLTFirstHead(row, ltt);
checkLongtableSpecial(ltt, value, flag); checkLongtableSpecial(ltt, value, flag);
@ -5943,6 +5952,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::UNSET_LTHEAD: case Tabular::UNSET_LTHEAD:
flag = false; flag = false;
// fall through
case Tabular::SET_LTHEAD: case Tabular::SET_LTHEAD:
tabular.getRowOfLTHead(row, ltt); tabular.getRowOfLTHead(row, ltt);
checkLongtableSpecial(ltt, value, flag); checkLongtableSpecial(ltt, value, flag);
@ -5951,6 +5961,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::UNSET_LTFOOT: case Tabular::UNSET_LTFOOT:
flag = false; flag = false;
// fall through
case Tabular::SET_LTFOOT: case Tabular::SET_LTFOOT:
tabular.getRowOfLTFoot(row, ltt); tabular.getRowOfLTFoot(row, ltt);
checkLongtableSpecial(ltt, value, flag); checkLongtableSpecial(ltt, value, flag);
@ -5959,6 +5970,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::UNSET_LTLASTFOOT: case Tabular::UNSET_LTLASTFOOT:
flag = false; flag = false;
// fall through
case Tabular::SET_LTLASTFOOT: case Tabular::SET_LTLASTFOOT:
tabular.getRowOfLTLastFoot(row, ltt); tabular.getRowOfLTLastFoot(row, ltt);
checkLongtableSpecial(ltt, value, flag); checkLongtableSpecial(ltt, value, flag);
@ -5967,6 +5979,7 @@ void InsetTabular::tabularFeatures(Cursor & cur,
case Tabular::UNSET_LTNEWPAGE: case Tabular::UNSET_LTNEWPAGE:
flag = false; flag = false;
// fall through
case Tabular::SET_LTNEWPAGE: case Tabular::SET_LTNEWPAGE:
tabular.setLTNewPage(row, flag); tabular.setLTNewPage(row, flag);
break; break;

4
src/output_latex.cpp
View File

@ -1021,8 +1021,8 @@ void TeXOnePar(Buffer const & buf,
break; break;
} }
} }
// possible
// fall through possible // fall through
default: default:
// we don't need it for the last paragraph!!! // we don't need it for the last paragraph!!!
if (nextpar) if (nextpar)

2
status.22x
View File

@ -36,6 +36,8 @@ What's new
* BUILD/INSTALLATION * BUILD/INSTALLATION
- Mark some intentional fall-throughs in order to silence false
-Wimplicit-fallthrough warnings with gcc7.
** Bug fixes: ** Bug fixes: