added a parseError signal to Buffer and use it

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 63e7aa4a9b24f43dad330ea68bbb9d49efe1d943..5348675679fefa664f161629588d7376afc34568 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -13,6 +13,7 @@
 #include "lyx_cb.h"
 #include "lyx_main.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "bufferlist.h"
 #include "bufferview_funcs.h"
 #include "debug.h"
@@ -75,7 +76,7 @@ void ShowMessage(Buffer const * buf,
 // Menu callbacks
 //
 
-bool MenuWrite(BufferView * bv, Buffer * buffer)
+bool MenuWrite(Buffer * buffer)
 {
        if (buffer->save()) {
                lastfiles->newFile(buffer->fileName());
@@ -92,13 +93,13 @@ bool MenuWrite(BufferView * bv, Buffer * buffer)
                text, 0, 1, _("&Rename"), _("&Cancel"));
 
        if (ret == 0)
-               return WriteAs(bv, buffer);
+               return WriteAs(buffer);
        return false;
 }
 
 
 
-bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
+bool WriteAs(Buffer * buffer, string const & filename)
 {
        string fname = buffer->fileName();
        string const oldname = fname;
@@ -153,7 +154,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
        bool unnamed = buffer->isUnnamed();
        buffer->setUnnamed(false);
 
-       if (!MenuWrite(bv, buffer)) {
+       if (!MenuWrite(buffer)) {
                buffer->setFileName(oldname);
                buffer->setUnnamed(unnamed);
                return false;
@@ -326,7 +327,7 @@ Buffer * NewFile(string const & filename)
                            << "\nTemplate is " << tmpname << endl;
 
        // find a free buffer
-       Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
+       Buffer * tmpbuf = newFile(name, tmpname);
        if (tmpbuf)
                lastfiles->newFile(tmpbuf->fileName());
        return tmpbuf;
@@ -420,15 +421,18 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 string const getPossibleLabel(BufferView const & bv)
 {
-       Paragraph * par = &*bv.getLyXText()->cursor.par();
-       LyXLayout_ptr layout = par->layout();
-       if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
-               Paragraph * par2 = par->previous();
+       ParagraphList::iterator pit = bv.getLyXText()->cursor.par();
+       ParagraphList & plist = bv.getLyXText()->ownerParagraphs();
 
-               LyXLayout_ptr const & layout2 = par2->layout();
+       LyXLayout_ptr layout = pit->layout();
+
+       if (layout->latextype == LATEX_PARAGRAPH && pit != plist.begin()) {
+               ParagraphList::iterator pit2 = boost::prior(pit);
+
+               LyXLayout_ptr const & layout2 = pit2->layout();
 
                if (layout2->latextype != LATEX_PARAGRAPH) {
-                       par = par2;
+                       pit = pit2;
                        layout = layout2;
                }
        }
@@ -442,7 +446,7 @@ string const getPossibleLabel(BufferView const & bv)
            lyxrc.label_init_length < 0)
                text.erase();
 
-       string par_text = par->asString(bv.buffer(), false);
+       string par_text = pit->asString(bv.buffer(), false);
        for (int i = 0; i < lyxrc.label_init_length; ++i) {
                if (par_text.empty())
                        break;