make ParagraphList::push_back take a reference instead of a pointer.

[features.git] / src / frontends / controllers / ControlDocument.C

diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index 36c92ed93e02861ab7affb905805fd8d46b85aa9..58b6877adf0e15d97617e63721ce37c039da633f 100644 (file)
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -19,6 +19,7 @@
 #include "lyxfind.h"
 
 #include "buffer.h"
+#include "errorlist.h"
 #include "language.h"
 #include "lyx_main.h"
 #include "lyxtextclass.h"
@@ -62,7 +63,6 @@ void ControlDocument::apply()
        if (!bufferIsAvailable())
                return;
 
-
        classApply();
 
        view().apply();
@@ -118,24 +118,14 @@ void ControlDocument::classApply()
        buffer()->params = *bp_;
 
        lv_.message(_("Converting document to new document class..."));
-       int ret = CutAndPaste::SwitchLayoutsBetweenClasses(
-               old_class, new_class,
-               lv_.buffer()->paragraphs);
 
-       if (!ret)
-               return;
+       ErrorList el;
+       CutAndPaste::SwitchLayoutsBetweenClasses(old_class, new_class,
+                                                lv_.buffer()->paragraphs,
+                                                el);
 
-       string s;
-       if (ret == 1) {
-               s = bformat(_("One paragraph could not be converted\n"
-                       "into the document class %1$s."),
-                       textclasslist[new_class].name());
-       } else {
-               s = bformat(_("%1$s paragraphs could not be converted\n"
-                       "into the document class %2$s."),
-                       textclasslist[new_class].name());
-       }
-       Alert::warning(_("Class conversion errors"), s);
+       bufferview()->setErrorList(el);
+       bufferview()->showErrorList(_("Class switch"));
 }
 
 
@@ -172,8 +162,8 @@ void ControlDocument::saveAsDefault()
        defaults.params = params();
 
        // add an empty paragraph. Is this enough?
-       Paragraph * par = new Paragraph;
-       par->layout(params().getLyXTextClass().defaultLayout());
+       Paragraph par;
+       par.layout(params().getLyXTextClass().defaultLayout());
        defaults.paragraphs.push_back(par);
 
        defaults.writeFile(defaults.fileName());