anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 09:15:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport change 24937 to branch:

Browse Source 
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
This commit is contained in:
Jean-Marc Lasgouttes 2008-05-26 11:05:44 +00:00
parent 55366efffb
commit fa85ed8a45
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/FuncStatus.cpp
View File

@ -41,7 +41,7 @@ void FuncStatus::unknown(bool b)
if (b) if (b)
v_ |= UNKNOWN; v_ |= UNKNOWN;
else else
v_ &= !UNKNOWN; v_ &= ~UNKNOWN;
} }
@ -55,7 +55,7 @@ bool FuncStatus::unknown() const
void FuncStatus::enabled(bool b) void FuncStatus::enabled(bool b)
{ {
if (b) if (b)
v_ &= !DISABLED; v_ &= ~DISABLED;
else else
v_ |= DISABLED; v_ |= DISABLED;
} }

14
src/Text3.cpp
View File

@ -1734,7 +1734,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_APPENDIX: case LFUN_APPENDIX:
flag.setOnOff(cur.paragraph().params().startOfAppendix()); flag.setOnOff(cur.paragraph().params().startOfAppendix());
return true; break;
case LFUN_BIBITEM_INSERT: case LFUN_BIBITEM_INSERT:
enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO
@ -1897,27 +1897,27 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_FONT_EMPH: case LFUN_FONT_EMPH:
flag.setOnOff(font.emph() == Font::ON); flag.setOnOff(font.emph() == Font::ON);
return true; break;
case LFUN_FONT_NOUN: case LFUN_FONT_NOUN:
flag.setOnOff(font.noun() == Font::ON); flag.setOnOff(font.noun() == Font::ON);
return true; break;
case LFUN_FONT_BOLD: case LFUN_FONT_BOLD:
flag.setOnOff(font.series() == Font::BOLD_SERIES); flag.setOnOff(font.series() == Font::BOLD_SERIES);
return true; break;
case LFUN_FONT_SANS: case LFUN_FONT_SANS:
flag.setOnOff(font.family() == Font::SANS_FAMILY); flag.setOnOff(font.family() == Font::SANS_FAMILY);
return true; break;
case LFUN_FONT_ROMAN: case LFUN_FONT_ROMAN:
flag.setOnOff(font.family() == Font::ROMAN_FAMILY); flag.setOnOff(font.family() == Font::ROMAN_FAMILY);
return true; break;
case LFUN_FONT_CODE: case LFUN_FONT_CODE:
flag.setOnOff(font.family() == Font::TYPEWRITER_FAMILY); flag.setOnOff(font.family() == Font::TYPEWRITER_FAMILY);
return true; break;
case LFUN_CUT: case LFUN_CUT:
case LFUN_COPY: case LFUN_COPY:

1
status.15x
View File

@ -74,6 +74,7 @@ What's new
- Fix display of filters such as "LaTeX (plain)" in the file dialog. - 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 * DOCUMENTATION AND LOCALIZATION