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

fix some C++ parsing bugs

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6598 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-03-27 17:38:24 +00:00
parent 0053732d5e
commit f2fd45633b
6 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,5 +1,11 @@
2003-03-27 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyxgluelength.h (isValidGlueLength): add default arg on
parameter 2. Remove default arg from friend in class.
* lyxlength.h (isValidLength): add default arg on parameter 2.
Remove default arg from friend in class.
* text2.C (LyXText): adjust, initialize refresh_row.
(init): adjust
(removeRow): adjust

12
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,9 @@
2003-03-27 Lars Gullik Bjønnes <larsbj@gullik.net>
* ControlDialog.tmpl (show): qualify emergency_exit_ with this->
(update): ditto
(hide): ditto
2003-03-26 Angus Leeming <leeming@lyx.org>
* ControlThesaurus.[Ch]: rewrite to use the Dialog-based scheme.
@ -187,7 +193,7 @@
* ControlConnections.C: temporary renaming of Dialogs::signals.
* Makefile.am: add new files.
2003-02-21 Angus Leeming <leeming@lyx.org>
* ControlBibtex.C (Browse):
@ -198,7 +204,7 @@
browse, browsedir):
* ControlPrint.C (Browse):
don't pass a LyXView & to browseFile et al.
* helper_funcs.[Ch] (browseFile, browseRelFile, browseDir):
* helper_funcs.[Ch] (browseFile, browseRelFile, browseDir):
don't pass a LyXView & to fileDlg.
2003-02-17 John Levon <levon@movementarian.org>
@ -246,7 +252,7 @@
2003-01-11 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* helper_funcs.[Ch]: implement browseDir (browse directory) [bug 824]
* ControlPrefs.[Ch]: implement browsedir for the use of use browseDir.
2002-12-02 Lars Gullik Bjønnes <larsbj@gullik.net>

6
src/frontends/controllers/ControlDialog.tmpl
View File

@ -38,7 +38,7 @@ void ControlDialog<Base>::show()
}
setParams();
if (emergency_exit_) {
if (this->emergency_exit_) {
hide();
return;
}
@ -57,7 +57,7 @@ void ControlDialog<Base>::update()
return;
setParams();
if (emergency_exit_) {
if (this->emergency_exit_) {
hide();
return;
}
@ -72,7 +72,7 @@ void ControlDialog<Base>::update()
template <class Base>
void ControlDialog<Base>::hide()
{
emergency_exit_ = false;
this->emergency_exit_ = false;
clearParams();
disconnect();

10
src/lyxgluelength.h
View File

@ -48,11 +48,8 @@ public:
///
string const asLatexString() const;
/** If "data" is valid, the length represented by it is
stored into "result", if that is not 0. */
friend bool isValidGlueLength(string const & data,
LyXGlueLength* result = 0);
LyXGlueLength* result);
private:
/// the normal vlaue
@ -67,7 +64,8 @@ private:
bool operator==(LyXGlueLength const & l1, LyXGlueLength const & l2);
///
bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2);
///
bool isValidGlueLength(string const & data, LyXGlueLength * result);
/** If "data" is valid, the length represented by it is
stored into "result", if that is not 0. */
bool isValidGlueLength(string const & data, LyXGlueLength * result = 0);
#endif // LYXGLUELENGTH_H

9
src/lyxlength.h
View File

@ -70,9 +70,7 @@ public:
/// return the on-screen size of this length of an image
int inBP() const;
/** If "data" is valid, the length represented by it is
stored into "result", if that is not 0. */
friend bool isValidLength(string const & data, LyXLength * result = 0);
friend bool isValidLength(string const & data, LyXLength * result);
private:
///
@ -85,8 +83,9 @@ private:
bool operator==(LyXLength const & l1, LyXLength const & l2);
///
bool operator!=(LyXLength const & l1, LyXLength const & l2);
///
bool isValidLength(string const & data, LyXLength * result);
/** If "data" is valid, the length represented by it is
stored into "result", if that is not 0. */
bool isValidLength(string const & data, LyXLength * result = 0);
/// return the name of the given unit number
char const * stringFromUnit(int unit);

1
src/text2.C
View File

@ -2318,7 +2318,6 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
}
setHeightOfRow(refresh_row);
}
} else {
Row * nextrow = old_cursor.row()->next();
const_cast<LyXText *>(this)->postPaint(