Author: rgheck
Date: Tue May 10 02:19:16 2011
New Revision: 38685
URL: http://www.lyx.org/trac/changeset/38685
Log:
Fix bug #7319 for branch.
This is a more conservative fix then for trunk.
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/Text.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/Text.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/Text.cpp Tue May 10 02:16:45
2011 (r38684)
+++ lyx-devel/branches/BRANCH_2_0_X/src/Text.cpp Tue May 10 02:19:16
2011 (r38685)
@@ -1644,13 +1644,9 @@
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
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Tue May 10 02:16:45 2011
(r38684)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Tue May 10 02:19:16 2011
(r38685)
@@ -81,6 +81,8 @@
- 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
