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

Crash fix from Angus

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1269 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-12-07 15:30:53 +00:00
parent f676dacf9c
commit 7d6a0f9506
5 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,14 @@
2000-12-07 Angus Leeming <a.leeming@ic.ac.uk>
* src/lyxparagraph.h, src/paragraph.C (CopyIntoMinibuffer): pass a
(Buffer const &), not a (BufferParams const &) and so fix a crash
caused by using current_view before it had been initialised. Not
the best way to do this, but much easier than changing
Inset::Clone(Buffer const &) to Inset::Clone().
* src/CutAndPaste.C:
* src/tabular.C: changed call to CopyIntoMinibuffer().
2000-12-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2000-12-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lib/ui/default.ui: put TOC at the beginning of the TOC menu. * lib/ui/default.ui: put TOC at the beginning of the TOC menu.
@ -7,8 +18,8 @@
2000-12-06 Angus Leeming <a.leeming@ic.ac.uk> 2000-12-06 Angus Leeming <a.leeming@ic.ac.uk>
* src/frontends/xforms/FormPreferences.C (ScreenFonts::build): changed * src/frontends/xforms/FormPreferences.C (ScreenFonts::build):
filter for screen fonts input filter from int to float changed filter for screen fonts input filter from int to float
* src/frontends/xforms/input_validators.c: removed. * src/frontends/xforms/input_validators.c: removed.
* src/frontends/xforms/input_validators.C: new file. Can now call C++ * src/frontends/xforms/input_validators.C: new file. Can now call C++
@ -17,9 +28,9 @@
* src/frontends/xforms/input_validators.[Ch] * src/frontends/xforms/input_validators.[Ch]
(fl_unsigned_float_filter): new filter function. (fl_unsigned_float_filter): new filter function.
* src/frontends/xforms/forms/fdfixc.sed: I defy gettext to get confused * src/frontends/xforms/forms/fdfixc.sed: I defy gettext to get
now! And if you think I'm going to do this in ./forms/fdfix.sh with confused now! And if you think I'm going to do this in
its "sed -e" declarations, then think again! ./forms/fdfix.sh with its "sed -e" declarations, then think again!
2000-12-06 Lars Gullik Bjønnes <larsbj@lyx.org> 2000-12-06 Lars Gullik Bjønnes <larsbj@lyx.org>

5
src/CutAndPaste.C
View File

@ -92,8 +92,7 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
if (end > startpar->Last()) if (end > startpar->Last())
end = startpar->Last(); end = startpar->Last();
for (; i < end; ++i) { for (; i < end; ++i) {
startpar->CopyIntoMinibuffer(current_view->buffer()->params, startpar->CopyIntoMinibuffer(*current_view->buffer(), start);
start);
startpar->Erase(start); startpar->Erase(start);
buf->InsertFromMinibuffer(buf->Last()); buf->InsertFromMinibuffer(buf->Last());
@ -188,7 +187,7 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
if (end > startpar->Last()) if (end > startpar->Last())
end = startpar->Last(); end = startpar->Last();
for (; i < end; ++i) { for (; i < end; ++i) {
startpar->CopyIntoMinibuffer(current_view->buffer()->params, i); startpar->CopyIntoMinibuffer(*current_view->buffer(), i);
buf->InsertFromMinibuffer(buf->Last()); buf->InsertFromMinibuffer(buf->Last());
} }
} else { } else {

6
src/lyxparagraph.h
View File

@ -477,8 +477,10 @@ public:
/// ///
void CloseFootnote(size_type pos); void CloseFootnote(size_type pos);
#endif #endif
/// important for cut and paste /** important for cut and paste
void CopyIntoMinibuffer(BufferParams const &, size_type pos) const; Temporary change from BufferParams to Buffer. Will revert when we
get rid of the argument to Inset::Clone(Buffer const &) */
void CopyIntoMinibuffer(Buffer const &, size_type pos) const;
/// ///
void CutIntoMinibuffer(BufferParams const &, size_type pos); void CutIntoMinibuffer(BufferParams const &, size_type pos);
/// ///

6
src/paragraph.C
View File

@ -407,15 +407,17 @@ void LyXParagraph::validate(LaTeXFeatures & features) const
// First few functions needed for cut and paste and paragraph breaking. // First few functions needed for cut and paste and paragraph breaking.
void LyXParagraph::CopyIntoMinibuffer(BufferParams const & bparams, void LyXParagraph::CopyIntoMinibuffer(Buffer const & buffer,
LyXParagraph::size_type pos) const LyXParagraph::size_type pos) const
{ {
BufferParams bparams = buffer.params;
minibuffer_char = GetChar(pos); minibuffer_char = GetChar(pos);
minibuffer_font = GetFontSettings(bparams, pos); minibuffer_font = GetFontSettings(bparams, pos);
minibuffer_inset = 0; minibuffer_inset = 0;
if (minibuffer_char == LyXParagraph::META_INSET) { if (minibuffer_char == LyXParagraph::META_INSET) {
if (GetInset(pos)) { if (GetInset(pos)) {
minibuffer_inset = GetInset(pos)->Clone(*current_view->buffer()); minibuffer_inset = GetInset(pos)->Clone(buffer);
} else { } else {
minibuffer_inset = 0; minibuffer_inset = 0;
minibuffer_char = ' '; minibuffer_char = ' ';

2
src/tabular.C
View File

@ -1463,7 +1463,7 @@ void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
par->InsertChar(i, ' '); par->InsertChar(i, ' ');
} }
} }
par->CopyIntoMinibuffer(owner_->BufferOwner()->params, i); par->CopyIntoMinibuffer(*owner_->BufferOwner(), i);
inset->par->InsertFromMinibuffer(inset->par->Last()); inset->par->InsertFromMinibuffer(inset->par->Last());
} }
delete par; delete par;