do not create invalid .lyx files when importing \i{}, \j{}, \l{} or \L{}.

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 147592e729c37e0458461889648952e5cbcbd0dd..1ece1addda7cd565d9c24aee084a518f9ffe4c68 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -764,12 +764,12 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_WORD_FIND_FORWARD:
                case LFUN_WORD_FIND_BACKWARD: {
                        BOOST_ASSERT(lyx_view_ && lyx_view_->view());
-                       static string last_search;
-                       string searched_string;
+                       static docstring last_search;
+                       docstring searched_string;
 
-                       if (!argument.empty()) {
-                               last_search = argument;
-                               searched_string = argument;
+                       if (!cmd.argument().empty()) {
+                               last_search = cmd.argument();
+                               searched_string = cmd.argument();
                        } else {
                                searched_string = last_search;
                        }
@@ -778,7 +778,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                break;
 
                        bool const fw = action == LFUN_WORD_FIND_FORWARD;
-                       string const data =
+                       docstring const data =
                                find2string(searched_string, true, false, fw);
                        find(view(), FuncRequest(LFUN_WORD_FIND, data));
                        break;
@@ -1034,19 +1034,10 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
 
                case LFUN_LYX_QUIT:
-                       // FIXME: this code needs to be transfered somewhere else
-                       // as lyx_view_ will most certainly be null and a same buffer
-                       // might be visible in more than one LyXView.
-                       if (lyx_view_ && lyx_view_->view()->buffer()) {
-                               // save cursor Position for opened files to .lyx/session
-                               LyX::ref().session().lastFilePos().save(FileName(lyx_view_->buffer()->fileName()),
-                                       boost::tie(view()->cursor().pit(), view()->cursor().pos()) );
-                       }
-                       
-                       // save the geometry of the current view 
-                       lyx_view_->saveGeometry();
-                       // quitting is triggered by the gui code (leaving the event loop)
-                       theApp()->gui().closeAllViews();
+                       // quitting is triggered by the gui code
+                       // (leaving the event loop).
+                       if (theBufferList().quitWriteAll())
+                               theApp()->gui().closeAllViews();
                        break;
 
                case LFUN_TOC_VIEW: {
@@ -1666,6 +1657,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_WINDOW_CLOSE:
                        BOOST_ASSERT(lyx_view_);
                        BOOST_ASSERT(theApp());
+                       // ask the user for saving changes or cancel quit
+                       if (!theBufferList().quitWriteAll())
+                               break;
                        lyx_view_->close();
                        return;