X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=2f1a715d084608ac194fb568e9c93e73cc3a3f72;hb=96007ce5ac7944bbb30366e21730979498ef296c;hp=64718ae12638fbe63b1eafd658694eb81e36c344;hpb=05dd160c87f321e603c4b93c6dd96678df35faf0;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 64718ae126..2f1a715d08 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -96,7 +96,13 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, Buffer const & buffer = cur.buffer(); pit_type pit = cur.pit(); pos_type pos = cur.pos(); - ParagraphList & pars = cur.text()->paragraphs(); + InsetText * target_inset = cur.inset().asInsetText(); + if (!target_inset) { + InsetTabular * it = cur.inset().asInsetTabular(); + target_inset = it? it->cell(cur.idx())->asInsetText() : 0; + } + LASSERT(target_inset, return make_pair(PitPosPair(pit, pos), pit)); + ParagraphList & pars = target_inset->paragraphs(); if (parlist.empty()) return make_pair(PitPosPair(pit, pos), pit); @@ -113,14 +119,14 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, // Convert newline to paragraph break in ERT inset. // This should not be here! - Inset * inset = pars[pit].inInset(); - if (inset && (inset->lyxCode() == ERT_CODE || - inset->lyxCode() == LISTINGS_CODE)) { + InsetCode const code = target_inset->lyxCode(); + if (code == ERT_CODE || code == LISTINGS_CODE) { for (size_t i = 0; i != insertion.size(); ++i) { for (pos_type j = 0; j != insertion[i].size(); ++j) { if (insertion[i].isNewline(j)) { // do not track deletion of newline insertion[i].eraseChar(j, false); + insertion[i].setInsetOwner(target_inset); breakParagraphConservative( buffer.params(), insertion, i, j); @@ -130,32 +136,33 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, } } - // set the paragraphs to empty layout if necessary + // set the paragraphs to plain layout if necessary if (cur.inset().usePlainLayout()) { bool forcePlainLayout = cur.inset().forcePlainLayout(); - Layout const & emptyLayout = newDocClass->emptyLayout(); + Layout const & plainLayout = newDocClass->plainLayout(); Layout const & defaultLayout = newDocClass->defaultLayout(); ParagraphList::iterator const end = insertion.end(); ParagraphList::iterator par = insertion.begin(); for (; par != end; ++par) { Layout const & parLayout = par->layout(); if (forcePlainLayout || parLayout == defaultLayout) - par->setLayout(emptyLayout); + par->setLayout(plainLayout); } - } else { // check if we need to reset from empty layout + } else { // check if we need to reset from plain layout Layout const & defaultLayout = newDocClass->defaultLayout(); - Layout const & emptyLayout = newDocClass->emptyLayout(); + Layout const & plainLayout = newDocClass->plainLayout(); ParagraphList::iterator const end = insertion.end(); ParagraphList::iterator par = insertion.begin(); for (; par != end; ++par) { Layout const & parLayout = par->layout(); - if (parLayout == emptyLayout) + if (parLayout == plainLayout) par->setLayout(defaultLayout); } } + InsetText in(buffer); // Make sure there is no class difference. - InsetText in; + in.paragraphs().clear(); // This works without copying any paragraph data because we have // a specialized swap method for ParagraphList. This is important // since we store pointers to insets at some places and we don't @@ -189,11 +196,11 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, max_depth = tmpbuf->getMaxDepthAfter(); // Set the inset owner of this paragraph. - tmpbuf->setInsetOwner(pars[pit].inInset()); + tmpbuf->setInsetOwner(target_inset); for (pos_type i = 0; i < tmpbuf->size(); ++i) { // do not track deletion of invalid insets if (Inset * inset = tmpbuf->getInset(i)) - if (!pars[pit].insetAllowed(inset->lyxCode())) + if (!target_inset->insetAllowed(inset->lyxCode())) tmpbuf->eraseChar(i--, false); } @@ -285,6 +292,9 @@ 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; @@ -371,6 +381,7 @@ void putClipboard(ParagraphList const & paragraphs, FileName::tempName().absFilename() + "_clipboard.internal"); buffer->setUnnamed(true); buffer->paragraphs() = paragraphs; + buffer->inset().setBuffer(*buffer); buffer->params().setDocumentClass(docclass); ostringstream lyx; if (buffer->write(lyx)) @@ -382,7 +393,7 @@ void putClipboard(ParagraphList const & paragraphs, } -void copySelectionHelper(Buffer const & buf, ParagraphList & pars, +void copySelectionHelper(Buffer const & buf, ParagraphList const & pars, pit_type startpit, pit_type endpit, int start, int end, DocumentClass const * const dc, CutStack & cutstack) { @@ -518,7 +529,7 @@ void switchBetweenClasses(DocumentClass const * const oldone, newtc.addLayoutIfNeeded(name); if (in.usePlainLayout()) - it->setLayout(newtc.emptyLayout()); + it->setLayout(newtc.plainLayout()); else it->setLayout(newtc[name]); } @@ -550,9 +561,11 @@ void switchBetweenClasses(DocumentClass const * const oldone, } -vector availableSelections() +vector availableSelections(Buffer const * buf) { vector selList; + if (!buf) + return selList; CutStack::const_iterator cit = theCuts.begin(); CutStack::const_iterator end = theCuts.end(); @@ -564,7 +577,10 @@ vector availableSelections() ParagraphList::const_iterator pit = pars.begin(); ParagraphList::const_iterator pend = pars.end(); for (; pit != pend; ++pit) { - asciiSel += pit->asString(AS_STR_INSETS); + Paragraph par(*pit, 0, 26); + // adapt paragraph to current buffer. + par.setBuffer(const_cast(*buf)); + asciiSel += par.asString(AS_STR_INSETS); if (asciiSel.size() > 25) { asciiSel.replace(22, docstring::npos, from_ascii("...")); @@ -665,7 +681,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) } -void copySelection(Cursor & cur) +void copySelection(Cursor const & cur) { copySelection(cur, cur.selectionAsString(true)); } @@ -673,7 +689,7 @@ void copySelection(Cursor & cur) namespace { -void copySelectionToStack(Cursor & cur, CutStack & cutstack) +void copySelectionToStack(Cursor const & cur, CutStack & cutstack) { // this doesn't make sense, if there is no selection if (!cur.selection()) @@ -709,8 +725,8 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack) ParagraphList pars; Paragraph par; BufferParams const & bp = cur.buffer().params(); - // FIXME This should be the empty layout...right? - par.setLayout(bp.documentClass().emptyLayout()); + // FIXME This should be the plain layout...right? + par.setLayout(bp.documentClass().plainLayout()); par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED)); pars.push_back(par); cutstack.push(make_pair(pars, bp.documentClassPtr())); @@ -727,7 +743,7 @@ void copySelectionToStack() } -void copySelection(Cursor & cur, docstring const & plaintext) +void copySelection(Cursor const & cur, docstring const & plaintext) { // In tablemode, because copy and paste actually use special table stack // we do not attempt to get selected paragraphs under cursor. Instead, a @@ -737,7 +753,7 @@ void copySelection(Cursor & cur, docstring const & plaintext) ParagraphList pars; Paragraph par; BufferParams const & bp = cur.buffer().params(); - par.setLayout(bp.documentClass().emptyLayout()); + par.setLayout(bp.documentClass().plainLayout()); par.insert(0, plaintext, Font(), Change(Change::UNCHANGED)); pars.push_back(par); theCuts.push(make_pair(pars, bp.documentClassPtr())); @@ -750,7 +766,7 @@ void copySelection(Cursor & cur, docstring const & plaintext) } -void saveSelection(Cursor & cur) +void saveSelection(Cursor const & cur) { // This function is called, not when a selection is formed, but when // a selection is cleared. Therefore, multiple keyboard selection @@ -785,7 +801,7 @@ void clearCutStack() docstring selection(size_t sel_index) { return sel_index < theCuts.size() - ? theCuts[sel_index].first.back().asString(AS_STR_INSETS) + ? theCuts[sel_index].first.back().asString(AS_STR_INSETS | AS_STR_NEWLINES) : docstring(); } @@ -899,7 +915,7 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwa DocIterator selbeg = cur.selectionBegin(); // Get font setting before we cut - Font const font = + Font const & font = selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos()); // Insert the new string @@ -977,7 +993,7 @@ void selClearOrDel(Cursor & cur) if (lyxrc.auto_region_delete) selDel(cur); else - cur.selection() = false; + cur.setSelection(false); }