X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=ecb4cbcafbaddca26dd6d71779a35775eea70975;hb=4df7d8ab1ae443119057562fb76c2e438c053eef;hp=2f1a715d084608ac194fb568e9c93e73cc3a3f72;hpb=96007ce5ac7944bbb30366e21730979498ef296c;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 2f1a715d08..ecb4cbcafb 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -3,8 +3,8 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Jürgen Vigna - * \author Lars Gullik Bjønnes + * \author Jürgen Vigna + * \author Lars Gullik Bjønnes * \author Alfredo Braunstein * \author Michael Gerz * @@ -41,6 +41,7 @@ #include "insets/InsetCommand.h" #include "insets/InsetGraphics.h" #include "insets/InsetGraphicsParams.h" +#include "insets/InsetInclude.h" #include "insets/InsetTabular.h" #include "mathed/MathData.h" @@ -93,7 +94,7 @@ pair pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, DocumentClass const * const oldDocClass, ErrorList & errorlist) { - Buffer const & buffer = cur.buffer(); + Buffer const & buffer = *cur.buffer(); pit_type pit = cur.pit(); pos_type pos = cur.pos(); InsetText * target_inset = cur.inset().asInsetText(); @@ -216,17 +217,16 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, } // Prepare the paragraphs and insets for insertion. - // A couple of insets store buffer references so need updating. insertion.swap(in.paragraphs()); InsetIterator const i_end = inset_iterator_end(in); - for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { - + // Even though this will also be done later, it has to be done here + // since, e.g., InsetLabel::updateCommand() is going to try to access + // the buffer() member. it->setBuffer(const_cast(buffer)); - switch (it->lyxCode()) { - + case LABEL_CODE: { // check for duplicates InsetCommand & lab = static_cast(*it); @@ -246,6 +246,12 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, break; } + case INCLUDE_CODE: { + InsetInclude & inc = static_cast(*it); + inc.updateCommand(); + break; + } + case BIBITEM_CODE: { // check for duplicates InsetCommand & bib = static_cast(*it); @@ -292,16 +298,19 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, // merge the first par of the insertion with the current par mergeParagraph(buffer.params(), pars, pit); } - //FIXME: We should call setBuffer() on each inserted paragraph. - // instead, we call setBuffer() for the main inset at the beginning - // of updateLabels() - - pit_type last_paste = pit + insertion.size() - 1; // Store the new cursor position. + pit_type last_paste = pit + insertion.size() - 1; + pit_type startpit = pit; pit = last_paste; pos = pars[last_paste].size(); + // FIXME Should we do it here, or should we let updateLabels() do it? + // Set paragraph buffers. It's important to do this right away + // before something calls Inset::buffer() and causes a crash. + for (pit_type p = startpit; p <= pit; ++p) + pars[p].setBuffer(const_cast(buffer)); + // Join (conditionally) last pasted paragraph with next one, i.e., // the tail of the spliced document paragraph if (!empty && last_paste + 1 != pit_type(pars.size())) { @@ -422,14 +431,16 @@ void copySelectionHelper(Buffer const & buf, ParagraphList const & pars, // ERT paragraphs have the Language latex_language. // This is invalid outside of ERT, so we need to change it // to the buffer language. - if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE) { + if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE) it->changeLanguage(buf.params(), latex_language, buf.language()); - } + it->setInsetOwner(0); } - // do not copy text (also nested in insets) which is marked as deleted - acceptChanges(copy_pars, buf.params()); + // do not copy text (also nested in insets) which is marked as deleted, + // unless the whole selection was deleted + if (!isFullyDeleted(copy_pars)) + acceptChanges(copy_pars, buf.params()); DocumentClass * d = const_cast(dc); cutstack.push(make_pair(copy_pars, d)); @@ -623,9 +634,9 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) int endpos = cur.selEnd().pos(); - BufferParams const & bp = cur.buffer().params(); + BufferParams const & bp = cur.buffer()->params(); if (realcut) { - copySelectionHelper(cur.buffer(), + copySelectionHelper(*cur.buffer(), text->paragraphs(), begpit, endpit, cur.selBegin().pos(), endpos, @@ -658,7 +669,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) // need a valid cursor. (Lgb) cur.clearSelection(); - updateLabels(cur.buffer()); + cur.buffer()->updateLabels(); // tell tabular that a recent copy happened dirtyTabularStack(false); @@ -687,6 +698,20 @@ void copySelection(Cursor const & cur) } +void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext) +{ + ParagraphList pars; + Paragraph par; + BufferParams const & bp = cur.buffer()->params(); + par.setLayout(bp.documentClass().plainLayout()); + par.insertInset(0, inset, Change(Change::UNCHANGED)); + pars.push_back(par); + theCuts.push(make_pair(pars, bp.documentClassPtr())); + + // stuff the selection onto the X clipboard, from an explicit copy request + putClipboard(theCuts[0].first, theCuts[0].second, plaintext); +} + namespace { void copySelectionToStack(Cursor const & cur, CutStack & cutstack) @@ -714,17 +739,21 @@ void copySelectionToStack(Cursor const & cur, CutStack & cutstack) (par != cur.selEnd().pit() || pos < cur.selEnd().pos())) ++pos; - copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(), + copySelectionHelper(*cur.buffer(), pars, par, cur.selEnd().pit(), pos, cur.selEnd().pos(), - cur.buffer().params().documentClassPtr(), cutstack); - dirtyTabularStack(false); + cur.buffer()->params().documentClassPtr(), cutstack); + + // Reset the dirty_tabular_stack_ flag only when something + // is copied to the clipboard (not to the selectionBuffer). + if (&cutstack == &theCuts) + dirtyTabularStack(false); } if (cur.inMathed()) { //lyxerr << "copySelection in mathed" << endl; ParagraphList pars; Paragraph par; - BufferParams const & bp = cur.buffer().params(); + BufferParams const & bp = cur.buffer()->params(); // FIXME This should be the plain layout...right? par.setLayout(bp.documentClass().plainLayout()); par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED)); @@ -752,7 +781,7 @@ void copySelection(Cursor const & cur, docstring const & plaintext) if (cur.selBegin().idx() != cur.selEnd().idx()) { ParagraphList pars; Paragraph par; - BufferParams const & bp = cur.buffer().params(); + BufferParams const & bp = cur.buffer()->params(); par.setLayout(bp.documentClass().plainLayout()); par.insert(0, plaintext, Font(), Change(Change::UNCHANGED)); pars.push_back(par); @@ -818,7 +847,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, boost::tie(ppp, endpit) = pasteSelectionHelper(cur, parlist, docclass, errorList); - updateLabels(cur.buffer()); + cur.buffer()->updateLabels(); cur.clearSelection(); text->setCursor(cur, ppp.first, ppp.second); } @@ -890,7 +919,7 @@ void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */, return; // create inset for graphic - InsetGraphics * inset = new InsetGraphics(cur.buffer()); + InsetGraphics * inset = new InsetGraphics(*cur.buffer()); InsetGraphicsParams params; params.filename = support::DocFileName(filename.absFilename()); inset->setParams(params); @@ -914,9 +943,9 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwa cur.recordUndo(); DocIterator selbeg = cur.selectionBegin(); - // Get font setting before we cut - Font const & font = - selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos()); + // Get font setting before we cut, we need a copy here, not a bare reference. + Font const font = + selbeg.paragraph().getFontSettings(cur.buffer()->params(), selbeg.pos()); // Insert the new string pos_type pos = cur.selEnd().pos(); @@ -924,7 +953,7 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwa docstring::const_iterator cit = str.begin(); docstring::const_iterator end = str.end(); for (; cit != end; ++cit, ++pos) - par.insertChar(pos, *cit, font, cur.buffer().params().trackChanges); + par.insertChar(pos, *cit, font, cur.buffer()->params().trackChanges); // Cut the selection cutSelection(cur, true, false); @@ -1061,5 +1090,4 @@ bool tabularStackDirty() } // namespace cap - } // namespace lyx