Author: vfr
Date: Tue Jun 1 18:13:54 2010
New Revision: 34583
URL: http://www.lyx.org/trac/changeset/34583
Log:
Fix bug #6744: Crash when copying an inset from a deleted section.
We need to reject the changes in when copying from a fully deleted section.
Modified:
lyx-devel/trunk/src/CutAndPaste.cpp
lyx-devel/trunk/src/Text.cpp
lyx-devel/trunk/src/Text.h
Modified: lyx-devel/trunk/src/CutAndPaste.cpp
==============================================================================
--- lyx-devel/trunk/src/CutAndPaste.cpp Tue Jun 1 16:19:40 2010 (r34582)
+++ lyx-devel/trunk/src/CutAndPaste.cpp Tue Jun 1 18:13:54 2010 (r34583)
@@ -539,6 +539,8 @@
// deleted, unless the whole selection was deleted
if (!isFullyDeleted(copy_pars))
acceptChanges(copy_pars, buf.params());
+ else
+ rejectChanges(copy_pars, buf.params());
// do some final cleanup now, to make sure that the paragraphs
Modified: lyx-devel/trunk/src/Text.cpp
==============================================================================
--- lyx-devel/trunk/src/Text.cpp Tue Jun 1 16:19:40 2010 (r34582)
+++ lyx-devel/trunk/src/Text.cpp Tue Jun 1 18:13:54 2010 (r34583)
@@ -259,37 +259,59 @@
}
-void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+static void acceptOrRejectChanges(ParagraphList & pars,
+ BufferParams const & bparams, Text::ChangeOp op)
{
pit_type pars_size = static_cast<pit_type>(pars.size());
- // first, accept changes within each individual paragraph
- // (do not consider end-of-par)
+ // first, accept or reject changes within each individual
+ // paragraph (do not consider end-of-par)
for (pit_type pit = 0; pit < pars_size; ++pit) {
- if (!pars[pit].empty()) // prevent assertion failure
- pars[pit].acceptChanges(0, pars[pit].size());
+ // prevent assertion failure
+ if (!pars[pit].empty()) {
+ if (op == Text::ACCEPT)
+ pars[pit].acceptChanges(0, pars[pit].size());
+ else
+ pars[pit].rejectChanges(0, pars[pit].size());
+ }
}
- // next, accept imaginary end-of-par characters
+ // next, accept or reject imaginary end-of-par characters
for (pit_type pit = 0; pit < pars_size; ++pit) {
pos_type pos = pars[pit].size();
-
- if (pars[pit].isInserted(pos)) {
- pars[pit].setChange(pos, Change(Change::UNCHANGED));
- } else if (pars[pit].isDeleted(pos)) {
- if (pit == pars_size - 1) {
- // we cannot remove a par break at the end of
the last
- // paragraph; instead, we mark it unchanged
+ if (pars[pit].isChanged(pos)) {
+ // keep the end-of-par char if it is inserted and
accepted
+ // or when it is deleted and rejected.
+ if (pars[pit].isInserted(pos) == (op == Text::ACCEPT)) {
pars[pit].setChange(pos,
Change(Change::UNCHANGED));
} else {
- mergeParagraph(bparams, pars, pit);
- --pit;
- --pars_size;
+ if (pit == pars_size - 1) {
+ // we cannot remove a par break at the
end of the last
+ // paragraph; instead, we mark it
unchanged
+ pars[pit].setChange(pos,
Change(Change::UNCHANGED));
+ } else {
+ mergeParagraph(bparams, pars, pit);
+ --pit;
+ --pars_size;
+ }
}
}
}
}
+
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+ acceptOrRejectChanges(pars, bparams, Text::ACCEPT);
+}
+
+
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+ acceptOrRejectChanges(pars, bparams, Text::REJECT);
+}
+
+
InsetText const & Text::inset() const
{
return *owner_;
Modified: lyx-devel/trunk/src/Text.h
==============================================================================
--- lyx-devel/trunk/src/Text.h Tue Jun 1 16:19:40 2010 (r34582)
+++ lyx-devel/trunk/src/Text.h Tue Jun 1 18:13:54 2010 (r34583)
@@ -395,6 +395,9 @@
/// accept the changes within the complete ParagraphList
void acceptChanges(ParagraphList & pars, BufferParams const & bparams);
+/// reject the changes within the complete ParagraphList
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams);
+
} // namespace lyx
#endif // TEXT_H
