Handle paragraph direction switch in captions (with polyglossia/bidi)

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 0f269b27e49e7423238fed5d614f4cb6f62e08d6..d7a3a1fd3612929f646001f66a3e4857d3e9692d 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -125,10 +125,23 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
        if (parlist.empty())
                return PasteReturnValue(pit, pos, need_update);
 
+       // Check whether we paste into an inset that does not
+       // produce output (needed for label duplicate check)
+       bool in_active_inset = cur.paragraph().inInset().producesOutput();
+       if (in_active_inset) {
+               for (size_type sl = 0 ; sl < cur.depth() ; ++sl) {
+                       Paragraph const & outer_par = cur[sl].paragraph();
+                       if (!outer_par.inInset().producesOutput()) {
+                               in_active_inset = false;
+                               break;
+                       }
+               }
+       }
+
        InsetText * target_inset = cur.inset().asInsetText();
        if (!target_inset) {
                InsetTabular * it = cur.inset().asInsetTabular();
-               target_inset = it ? it->cell(cur.idx())->asInsetText() : 0;
+               target_inset = it ? it->cell(cur.idx())->asInsetText() : nullptr;
        }
        LASSERT(target_inset, return PasteReturnValue(pit, pos, need_update));
 
@@ -291,8 +304,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
        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 some inset might going to try to access
-               // the buffer() member.
+               // since some inset might try to access the buffer() member.
                it->setBuffer(const_cast<Buffer &>(buffer));
                switch (it->lyxCode()) {
 
@@ -305,7 +317,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                                        continue;
                                InsetLabel * lab = labels[i];
                                docstring const oldname = lab->getParam("name");
-                               lab->updateLabel(oldname);
+                               lab->updateLabel(oldname, in_active_inset);
                                // We need to update the buffer reference cache.
                                need_update = true;
                                docstring const newname = lab->getParam("name");
@@ -336,7 +348,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                        // check for duplicates
                        InsetLabel & lab = static_cast<InsetLabel &>(*it);
                        docstring const oldname = lab.getParam("name");
-                       lab.updateLabel(oldname);
+                       lab.updateLabel(oldname, in_active_inset);
                        // We need to update the buffer reference cache.
                        need_update = true;
                        docstring const newname = lab.getParam("name");
@@ -567,7 +579,7 @@ Buffer * copyToTempBuffer(ParagraphList const & paragraphs, DocumentClassConstPt
        // Use a clone for the complicated stuff so that we do not need to clean
        // up in order to avoid a crash.
        Buffer * buffer = staticbuffer->cloneBufferOnly();
-       LASSERT(buffer, return 0);
+       LASSERT(buffer, return nullptr);
 
        // This needs doing every time.
        // Since setDocumentClass() causes deletion of the old document class
@@ -710,7 +722,7 @@ void copySelectionHelper(Buffer const & buf, Text const & text,
        it = copy_pars.begin();
        for (; it != it_end; ++it) {
                it->resetBuffer();
-               it->setInsetOwner(0);
+               it->setInsetOwner(nullptr);
        }
 
        cutstack.push(make_pair(copy_pars, dc));