Move OS specific code to proper place. Also make sure that no other

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index b3137ad4b73cc1ea091b14259b298c9daeba7381..c97a6cddf4d0969f30a58f21874c17e1555d4cb4 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1316,7 +1316,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 
        sgml::openTag(os, top);
        os << '\n';
-       docbookParagraphs(paragraphs(), *this, os, runparams);
+       docbookParagraphs(text(), *this, os, runparams);
        sgml::closeTag(os, top_element);
 }
 
@@ -1374,7 +1374,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
        }
 
        params().documentClass().counters().reset();
-       xhtmlParagraphs(paragraphs(), *this, os, runparams);
+       xhtmlParagraphs(text(), *this, os, runparams);
        if (!only_body)
                os << "</body>\n</html>\n";
 }
@@ -2580,7 +2580,7 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
                texrow.newline();
                // output paragraphs
                if (isDocBook())
-                       docbookParagraphs(paragraphs(), *this, os, runparams);
+                       docbookParagraphs(text(), *this, os, runparams);
                else 
                        // latex or literate
                        latexParagraphs(*this, text(), os, texrow, runparams);
@@ -3040,11 +3040,32 @@ bool Buffer::readFileHelper(FileName const & s)
                                      _("&Recover"),  _("&Load Original"),
                                      _("&Cancel")))
                {
-               case 0:
+               case 0: {
                        // the file is not saved if we load the emergency file.
                        markDirty();
-                       return readFile(e);
+                       docstring str;
+                       bool res;
+
+                       if ((res = readFile(e)) == success)
+                               str = _("Document was successfully recovered.");
+                       else
+                               str = _("Document was NOT successfully recovered.");
+                       str += "\n\n" + _("Remove emergency file now?");
+
+                       if (!Alert::prompt(_("Delete emergency file?"), str, 1, 1,
+                                       _("&Remove"), _("&Keep it"))) {
+                               e.removeFile();
+                               if (res == success)
+                                       Alert::warning(_("Emergency file deleted"),
+                                               _("Do not forget to save your file now!"), true);
+                               }
+                       return res;
+               }
                case 1:
+                       if (!Alert::prompt(_("Delete emergency file?"),
+                                       _("Remove emergency file now?"), 1, 1,
+                                       _("&Remove"), _("&Keep it")))
+                               e.removeFile();
                        break;
                default:
                        return false;
@@ -3297,7 +3318,7 @@ static void setLabel(Buffer const & buf, ParIterator & it)
        case LABEL_COUNTER:
                if (layout.toclevel <= bp.secnumdepth
                    && (layout.latextype != LATEX_ENVIRONMENT
-                       || isFirstInSequence(it.pit(), it.plist()))) {
+                       || it.text()->isFirstInSequence(it.pit()))) {
                        counters.step(layout.counter);
                        par.params().labelString(
                                par.expandLabel(layout, bp));