Personalize fonts

[features.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 60705c0b3470025d2b8be59eaaecfedac8fb4009..59bfbefea968595471fa16d1209be8f64a7e3bc9 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -37,7 +37,6 @@
 #include "InsetList.h"
 #include "Language.h"
 #include "Layout.h"
-#include "Length.h"
 #include "Lexer.h"
 #include "lyxfind.h"
 #include "LyXRC.h"
@@ -65,6 +64,7 @@
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
+#include "support/Length.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/lyxtime.h"
@@ -1833,7 +1833,8 @@ bool Text::dissolveInset(Cursor & cur)
                 */
                DocumentClass const & tclass = cur.buffer()->params().documentClass();
                if (inset_it.lastpos() == 1
-                   && plist[0].layout().name() != tclass.plainLayoutName())
+                       && !tclass.isPlainLayout(plist[0].layout())
+                       && !tclass.isDefaultLayout(plist[0].layout()))
                        cur.paragraph().makeSameLayout(plist[0]);
 
                pasteParagraphList(cur, plist, b.params().documentClassPtr(),