Fix bug #8891 (wrong depth of copied text)

This was an obvious thinko: When pasting a paragraph list the depth of the
pasted paragraphs need to be adjusted, so that no paragraph has a negative
depth afterwards. However, the maximum allowed depth was only adjusted after
the second and following pasted paragraphs. Since the computed value was only
used for the subsequent paragrph this meant that the second paragraph did
still use the same maximum allowed depth as the first one, which came from the
paragraph the text as pasted into. This was wrong e.g. in case the outside
paragraph was a standard paragraph (max_depth = 0), and the first pasted
paragraph was an enumeration (max_depth = 1). Therefore, max_depth needs to
be adjusted also after the first pasted paragaph. Since the adjustment is
done aftre max_depth was used for the current paragraph the condition
mentioned in the comment is still met.
(cherry picked from commit 270201ed67)
This commit is contained in:
Georg Baum 2014-02-22 11:02:50 +01:00 committed by Richard Heck
parent 53771a2716
commit e09faf7ce6
2 changed files with 5 additions and 5 deletions

View File

@ -196,10 +196,8 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist,
if (tmpbuf->params().depth() > max_depth)
tmpbuf->params().depth(max_depth);
// Only set this from the 2nd on as the 2nd depends
// for maxDepth still on pit.
if (tmpbuf != insertion.begin())
max_depth = tmpbuf->getMaxDepthAfter();
// Set max_depth for the next paragraph
max_depth = tmpbuf->getMaxDepthAfter();
// Set the inset owner of this paragraph.
tmpbuf->setInsetOwner(target_inset);

View File

@ -61,7 +61,9 @@ What's new
- Support (black) card suites in text mode (bug 8971).
- Use universal newlines when reading CSVs
- Use universal newlines when reading CSVs.
- Fix bug where depth of pasted text was incorrectly set (bug 8891).
* USER INTERFACE