anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-06 00:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This should fix the "oops" in the "is a bit silly" bug fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7947 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2003-10-22 06:02:55 +00:00
parent 272af48ec9
commit c7c37bee5e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-10-22 Martin Vermeer <martin.vermeer@hut.fi>
* text.C: fixed an "oops" in the "is a bit silly"
bug fix
2003-10-21 André Pönitz <poenitz@gmx.net>

8
src/text.C
View File

@ -727,8 +727,12 @@ pos_type LyXText::rowBreakPoint(ParagraphList::iterator pit,
if (point == last || chunkwidth >= width - left) {
if (pos < i) {
point = i - 1;
// exit on last registered breakpoint:
break;
}
}
// emergency exit:
if (i + 1 < last)
break;
}
@ -736,6 +740,7 @@ pos_type LyXText::rowBreakPoint(ParagraphList::iterator pit,
if (!in || in->isChar()) {
// some insets are line separators too
if (pit->isLineSeparator(i)) {
// register breakpoint:
point = i;
chunkwidth = 0;
}
@ -1453,7 +1458,8 @@ void LyXText::prepareToPrint(ParagraphList::iterator pit,
// Display-style insets should always be on a centred row
// The test on pit->size() is to catch zero-size pars, which
// would trigger the assert in Paragraph::getInset().
inset = pit->size() ? pit->getInset(rit->pos()) : 0;
//inset = pit->size() ? pit->getInset(rit->pos()) : 0;
inset = pit->isInset(rit->pos()) ? pit->getInset(rit->pos()) : 0;
if (inset && inset->display()) {
align = LYX_ALIGN_CENTER;
}