Clear background behind sublables when necessary.

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 988dba41542fd375439dc54f5a6d5f2b175302c8..d5aa08712558b87578ec493fdb73224a564fefb6 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -486,16 +486,18 @@ Buffer * copyToTempBuffer(ParagraphList const & paragraphs, DocumentClassConstPt
        // to be so, but the alternative is to construct a new one of these (with a
        // new temporary directory, etc) every time, and then to destroy it. So maybe
        // it's worth just keeping this one around.
-       // FIXME THREAD
        static TempFile tempfile("clipboard.internal");
        tempfile.setAutoRemove(false);
-       static Buffer * staticbuffer = theBufferList().newInternalBuffer(
-                       tempfile.name().absFileName());
-
-       // These two things only really need doing the first time.
-       staticbuffer->setUnnamed(true);
-       staticbuffer->inset().setBuffer(*staticbuffer);
-
+       // The initialization of staticbuffer is thread-safe. Using a lambda
+       // guarantees that the properties are set only once.
+       static Buffer * staticbuffer = [&](){
+               Buffer * b =
+                       theBufferList().newInternalBuffer(tempfile.name().absFileName());
+               b->setUnnamed(true);
+               b->inset().setBuffer(*b);
+               //initialize staticbuffer with b
+               return b;
+       }();
        // 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();
@@ -749,8 +751,8 @@ void switchBetweenClasses(DocumentClassConstPtr oldone,
                if (added_one || newlayouts.find(name) != newlayouts.end()) {
                        // Warn the user.
                        docstring const s = bformat(_("Layout `%1$s' was not found."), name);
-                       errorlist.push_back(
-                               ErrorItem(_("Layout Not Found"), s, it->id(), 0, it->size()));
+                       errorlist.push_back(ErrorItem(_("Layout Not Found"), s,
+                                                     {it->id(), 0}, {it->id(), -1}));
                }
 
                if (in.usePlainLayout())
@@ -785,8 +787,9 @@ void switchBetweenClasses(DocumentClassConstPtr oldone,
                                        layoutName, oldname, newname);
                        // To warn the user that something had to be done.
                        errorlist.push_back(ErrorItem(
-                                       _("Undefined flex inset"),
-                                       s, it.paragraph().id(), it.pos(), it.pos() + 1));
+                                                     _("Undefined flex inset"), s,
+                                                     {it.paragraph().id(), it.pos()},
+                                                     {it.paragraph().id(), it.pos()+1}));
                } else if (code == TABULAR_CODE) {
                        // The recursion above does not catch paragraphs in "hidden" cells,
                        // i.e., ones that are part of a multirow or multicolum. So we need