layout as string

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 2eab33a685ffd3c3e147d44ca979480ee9ffbce6..0ad7fe6162367b521f4a37fea0b7653fd07f329c 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -26,7 +26,6 @@
 
 using std::pair;
 using lyx::pos_type;
-using lyx::layout_type;
 using lyx::textclass_type;
 
 extern BufferView * current_view;
@@ -380,26 +379,28 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
        ParIterator end = ParIterator();
        for (ParIterator it = ParIterator(par); it != end; ++it) {
                par = *it;
-               string const name = textclasslist.NameOfLayout(c1, par->layout);
-               int lay = 0;
-               pair<bool, layout_type> pp =
-                       textclasslist.NumberOfLayout(c2, name);
-               if (pp.first) {
-                       lay = pp.second;
+               string const name = par->layout();
+               LyXTextClass const & tclass = textclasslist[c2];
+               
+               bool hasLayout = tclass.hasLayout(name);
+               
+               string lay = tclass.defaultLayoutName();
+               if (hasLayout) {
+                       lay = name;
                } else {
-                       // not found: use default layout "Standard" (0)
-                       lay = 0;
+                       // not found: use default layout
+                       lay = tclass.defaultLayoutName();
                }
-               par->layout = lay;
+               par->layout(lay);
                
-               if (name != textclasslist.NameOfLayout(c2, par->layout)) {
+               if (name != par->layout()) {
                        ++ret;
                        string const s = _("Layout had to be changed from\n")
                                + name + _(" to ")
-                               + textclasslist.NameOfLayout(c2, par->layout)
+                               + par->layout()
                                + _("\nbecause of class conversion from\n")
-                               + textclasslist.NameOfClass(c1) + _(" to ")
-                               + textclasslist.NameOfClass(c2);
+                               + textclasslist[c1].name() + _(" to ")
+                               + textclasslist[c2].name();
                        InsetError * new_inset = new InsetError(s);
                        par->insertInset(0, new_inset,
                                         LyXFont(LyXFont::ALL_INHERIT,