From fa85ed8a45b37fa49e05871c7d17e29373121c4a Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 26 May 2008 11:05:44 +0000 Subject: [PATCH] Backport change 24937 to branch: Note to self: `!' is not the complement-to-one operator... This allows me to revert a 3 years old commit from Juergen that I never managed to understand before. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@24943 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/FuncStatus.cpp | 4 ++-- src/Text3.cpp | 14 +++++++------- status.15x | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/FuncStatus.cpp b/src/FuncStatus.cpp index 17e59e677d..f7b529b856 100644 --- a/src/FuncStatus.cpp +++ b/src/FuncStatus.cpp @@ -41,7 +41,7 @@ void FuncStatus::unknown(bool b) if (b) v_ |= UNKNOWN; else - v_ &= !UNKNOWN; + v_ &= ~UNKNOWN; } @@ -55,7 +55,7 @@ bool FuncStatus::unknown() const void FuncStatus::enabled(bool b) { if (b) - v_ &= !DISABLED; + v_ &= ~DISABLED; else v_ |= DISABLED; } diff --git a/src/Text3.cpp b/src/Text3.cpp index 335fcc0eee..1e1255dfdf 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -1734,7 +1734,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_APPENDIX: flag.setOnOff(cur.paragraph().params().startOfAppendix()); - return true; + break; case LFUN_BIBITEM_INSERT: enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO @@ -1897,27 +1897,27 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_FONT_EMPH: flag.setOnOff(font.emph() == Font::ON); - return true; + break; case LFUN_FONT_NOUN: flag.setOnOff(font.noun() == Font::ON); - return true; + break; case LFUN_FONT_BOLD: flag.setOnOff(font.series() == Font::BOLD_SERIES); - return true; + break; case LFUN_FONT_SANS: flag.setOnOff(font.family() == Font::SANS_FAMILY); - return true; + break; case LFUN_FONT_ROMAN: flag.setOnOff(font.family() == Font::ROMAN_FAMILY); - return true; + break; case LFUN_FONT_CODE: flag.setOnOff(font.family() == Font::TYPEWRITER_FAMILY); - return true; + break; case LFUN_CUT: case LFUN_COPY: diff --git a/status.15x b/status.15x index 7f03ee2d8e..ac0fe9f217 100644 --- a/status.15x +++ b/status.15x @@ -74,6 +74,7 @@ What's new - Fix display of filters such as "LaTeX (plain)" in the file dialog. +- Fix 7 years-old bug with functions whose state can be toggled. * DOCUMENTATION AND LOCALIZATION