fix some C++ parsing bugs

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 757487b531d9ce26a0715cdb6bfab8b71eda3565..df1a9530ef5dac1fc49c8979a8dc18703f8f44e8 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -104,8 +104,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 
        if (filename.empty()) {
 
-               FileDialog fileDlg(bv->owner(),
-                                  _("Choose a filename to save document as"),
+               FileDialog fileDlg(_("Choose a filename to save document as"),
                        LFUN_WRITEAS,
                        make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
@@ -117,7 +116,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 
                FileDialog::Result result =
                        fileDlg.save(OnlyPath(fname),
-                                      _("*.lyx|LyX Documents (*.lyx)"),
+                                      _("*.lyx| LyX Documents (*.lyx)"),
                                       OnlyFilename(fname));
 
                if (result.first == FileDialog::Later)
@@ -405,12 +404,11 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
        if (flag)
                bv->beforeChange(bv->text);
        if (!asParagraph)
-               bv->getLyXText()->insertStringAsLines(bv, tmpstr);
+               bv->getLyXText()->insertStringAsLines(tmpstr);
        else
-               bv->getLyXText()->insertStringAsParagraphs(bv, tmpstr);
+               bv->getLyXText()->insertStringAsParagraphs(tmpstr);
        if (flag)
-               bv->update(bv->text,
-                          BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               bv->update(BufferView::SELECT);
 }
 
 
@@ -420,7 +418,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
        string fname = f;
 
        if (fname.empty()) {
-               FileDialog fileDlg(bv->owner(), _("Select file to insert"),
+               FileDialog fileDlg(_("Select file to insert"),
                        (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
 
                FileDialog::Result result = fileDlg.open(bv->owner()->buffer()->filePath());
@@ -444,7 +442,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               Alert::err_alert(_("Error! Cannot open specified file: "),
+               Alert::err_alert(_("Error! Cannot open specified file:"),
                             MakeDisplayPath(fname, 50));
                return string();
        }
@@ -470,55 +468,43 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 }
 
 
-void MenuInsertLabel(BufferView * bv, string const & arg)
+string const getPossibleLabel(BufferView const & bv)
 {
-       string label = arg;
-       bv->owner()->prohibitInput();
-       if (label.empty()) {
-               Paragraph * par = bv->getLyXText()->cursor.par();
-               LyXLayout_ptr layout = par->layout();
-               if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
-                       Paragraph * par2 = par->previous();
-
-                       LyXLayout_ptr const & layout2 = par2->layout();
-
-                       if (layout2->latextype != LATEX_PARAGRAPH) {
-                               par = par2;
-                               layout = layout2;
-                       }
-               }
-               string text = layout->latexname().substr(0, 3);
-               if (layout->latexname() == "theorem")
-                       text = "thm"; // Create a correct prefix for prettyref
-
-               text += ':';
-               if (layout->latextype == LATEX_PARAGRAPH ||
-                   lyxrc.label_init_length < 0)
-                       text.erase();
-               string par_text = par->asString(bv->buffer(), false);
-               for (int i = 0; i < lyxrc.label_init_length; ++i) {
-                       if (par_text.empty())
-                               break;
-                       string head;
-                       par_text = split(par_text, head, ' ');
-                       if (i > 0)
-                               text += '-'; // Is it legal to use spaces in
-                                            // labels ?
-                       text += head;
-               }
+       Paragraph * par = bv.getLyXText()->cursor.par();
+       LyXLayout_ptr layout = par->layout();
+       if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
+               Paragraph * par2 = par->previous();
 
-               pair<bool, string> result =
-                       Alert::askForText(_("Enter new label to insert:"), text);
-               if (result.first) {
-                       label = trim(result.second);
+               LyXLayout_ptr const & layout2 = par2->layout();
+
+               if (layout2->latextype != LATEX_PARAGRAPH) {
+                       par = par2;
+                       layout = layout2;
                }
        }
-       if (!label.empty()) {
-               InsetCommandParams p("label", label);
-               InsetLabel * inset = new InsetLabel(p);
-               bv->insertInset(inset);
+
+       string text = layout->latexname().substr(0, 3);
+       if (layout->latexname() == "theorem")
+               text = "thm"; // Create a correct prefix for prettyref
+
+       text += ':';
+       if (layout->latextype == LATEX_PARAGRAPH ||
+           lyxrc.label_init_length < 0)
+               text.erase();
+
+       string par_text = par->asString(bv.buffer(), false);
+       for (int i = 0; i < lyxrc.label_init_length; ++i) {
+               if (par_text.empty())
+                       break;
+               string head;
+               par_text = split(par_text, head, ' ');
+               if (i > 0)
+                       text += '-'; // Is it legal to use spaces in
+               // labels ?
+               text += head;
        }
-       bv->owner()->allowInput();
+
+       return text;
 }