Avoid pointless 'undefined flex inset' errors

When switching class, it does not make sense to flag flex insets that
are undefined if they were already undefined before.

Part of bug #12163.

(cherry picked from commit 009efa195bf2837a007c0b070261b34a715b9b39)

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index e31151b8f2abf4dc93c2b8489c59498d3abe8b5a..b436167308f11299235f710c29842f167cf65ab4 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -835,7 +835,10 @@ void switchBetweenClasses(DocumentClassConstPtr oldone,
                        docstring const & n = newone->insetLayout(layoutName).name();
                        bool const is_undefined = n.empty() ||
                                n == DocumentClass::plainInsetLayout().name();
-                       if (!is_undefined)
+                       docstring const & oldn = oldone->insetLayout(layoutName).name();
+                       bool const was_undefined = oldn.empty() ||
+                               oldn == DocumentClass::plainInsetLayout().name();
+                       if (!is_undefined || was_undefined)
                                continue;
 
                        // The flex inset is undefined in newtc

diff --git a/status.23x b/status.23x
index 8296a854e618d7c28b765cd36daa5cf41ac44705..2e3615dd2ff2d78322f900e8d1970a6d460a9611 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -103,6 +103,9 @@ What's new
 
 - Fix wrap-around of spellchecker (#10383).
 
+- Avoid pointless 'undefined flex inset' errors when changing document
+  settings (bug 12163).
+
 
 * INTERNALS