anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-06 01:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 490; fix backward/forward search

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@5871 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-12-19 11:02:04 +00:00
parent 6b93dc8b8a
commit 85bf978cf6
7 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -1,3 +1,12 @@
2002-12-18 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* lyxlength.[Ch]: set default unit to UNIT_NONE,
implement bool empty() [bug 490]
2002-12-17 Alfredo Braunstein <abraunst@libero.it>
* lyxfunc.C: correct inversion of WORDFINDBACK/FORWARD
2002-12-16 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-16 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* version.C.in: update (again) release date for 1.2.2 * version.C.in: update (again) release date for 1.2.2

5
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,8 @@
2002-12-18 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* xforms_helpers.C: (updateWidgetsFromLength)
use len.empty() instead of len.zero() [bug 490]
2002-10-22 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-10-22 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* xformsGImage.C (getWidth): add 4 instead of 2 in the fix below, * xformsGImage.C (getWidth): add 4 instead of 2 in the fix below,

2
src/frontends/xforms/xforms_helpers.C
View File

@ -201,7 +201,7 @@ void updateWidgetsFromLength(FL_OBJECT * input, FL_OBJECT * choice,
lyx::Assert(input && input->objclass == FL_INPUT && lyx::Assert(input && input->objclass == FL_INPUT &&
choice && choice->objclass == FL_CHOICE); choice && choice->objclass == FL_CHOICE);
if (len.zero()) { if (len.empty()) {
fl_set_input(input, ""); fl_set_input(input, "");
fl_set_choice_text(choice, default_unit.c_str()); fl_set_choice_text(choice, default_unit.c_str());
} else { } else {

2
src/lyxfunc.C
View File

@ -1045,7 +1045,7 @@ string const LyXFunc::dispatch(kb_action action, string argument)
} else { } else {
searched_string = last_search; searched_string = last_search;
} }
bool fw = (action == LFUN_WORDFINDBACKWARD); bool fw = (action == LFUN_WORDFINDFORWARD);
if (!searched_string.empty()) { if (!searched_string.empty()) {
lyxfind::LyXFind(owner->view(), searched_string, fw); lyxfind::LyXFind(owner->view(), searched_string, fw);
} }

8
src/lyxlength.C
View File

@ -27,7 +27,7 @@
using std::abs; using std::abs;
LyXLength::LyXLength() LyXLength::LyXLength()
: val_(0), unit_(LyXLength::PT) : val_(0), unit_(LyXLength::UNIT_NONE)
{} {}
@ -160,6 +160,12 @@ bool LyXLength::zero() const
} }
bool LyXLength::empty() const
{
return unit_ == LyXLength::UNIT_NONE;
}
int LyXLength::inPixels(int default_width, int default_height) const int LyXLength::inPixels(int default_width, int default_height) const
{ {
// Zoom factor specified by user in percent // Zoom factor specified by user in percent

2
src/lyxlength.h
View File

@ -63,6 +63,8 @@ public:
void unit(LyXLength::UNIT unit); void unit(LyXLength::UNIT unit);
/// ///
bool zero() const; bool zero() const;
///
bool empty() const;
/// return string representation /// return string representation
string const asString() const; string const asString() const;
/// return string representation for LaTeX /// return string representation for LaTeX

6
status.12x
View File

@ -22,4 +22,10 @@ What's new
** Bug fixes ** Bug fixes
- fix problem where it was not possible to force some values to 0 in
custom margins
- fix functions word-find-forward and word-find-backward, which
meaning was inverted
- fix an installation issue with solaris - fix an installation issue with solaris