Fix bug #7319 for branch.

This is a more conservative fix then for trunk.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38685 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Text.cpp b/src/Text.cpp
index fad29a745972b674fe267c101bf58319f249fc22..1da59db4c823b8687f3e4f5ba1457d69020d4cde 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1644,13 +1644,9 @@ bool Text::dissolveInset(Cursor & cur)
 
        if (!plist.empty()) {
                // see bug 7319
-               // we clear the cache so that we won't get conflicts with labels
-               // that get pasted into the buffer. we should update this before
-               // its being empty matters. if not (i.e., if we encounter bugs),
-               // then this should instead be:
-               //        cur.buffer().updateBuffer();
-               // but we'll try the cheaper solution here.
-               cur.buffer()->clearReferenceCache();
+               // we need to update here since we need to refresh
+               // the reference cache.
+               cur.buffer()->updateBuffer();
 
                // ERT paragraphs have the Language latex_language.
                // This is invalid outside of ERT, so we need to

diff --git a/status.20x b/status.20x
index c64fe20fef4a048daa8cc2140315ccc9b9548da2..062921ca795d0865dec9ba1ae47c960c75590b59 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -81,6 +81,8 @@ What's new
 - Restore the functionality of the TeX Information dialog on Cygwin if a
   native Windows TeX engine is used.
 
+- Correct erroneous report of duplicate labels when dissolving insets (#7319).
+
 
 * DOCUMENTATION AND LOCALIZATION