* Paragraph: reserve memory by chunks of 100 chars. This improve the loading of big...

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 5582d28c96c8b6fb750a20611c975c339bb192c7..2b6820949c4ec46b6b44fc7e460fb1858ec11e3f 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -25,6 +25,7 @@
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "DispatchResult.h"
+#include "EmbeddedFiles.h"
 #include "ErrorList.h"
 #include "factory.h"
 #include "FloatList.h"
@@ -917,6 +918,11 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
                flag.setOnOff(buffer_.params().compressed);
                break;
        }
+       
+       case LFUN_BUFFER_TOGGLE_EMBEDDING: {
+               flag.setOnOff(buffer_.params().embedded);
+               break;
+       }
 
        case LFUN_SCREEN_UP:
        case LFUN_SCREEN_DOWN:
@@ -1298,6 +1304,11 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
                // turn compression on/off
                buffer_.params().compressed = !buffer_.params().compressed;
                break;
+       
+       case LFUN_BUFFER_TOGGLE_EMBEDDING:
+               // turn embedding on/off
+               buffer_.embeddedFiles().enable(!buffer_.params().embedded);
+               break;
 
        case LFUN_NEXT_INSET_TOGGLE: {
                // this is the real function we want to invoke
@@ -1966,7 +1977,7 @@ void BufferView::menuInsertLyXFile(string const & filenm)
 
        docstring res;
        Buffer buf("", false);
-       if (lyx::loadLyXFile(&buf, FileName(filename))) {
+       if (buf.loadLyXFile(FileName(filename))) {
                ErrorList & el = buffer_.errorList("Parse");
                // Copy the inserted document error list into the current buffer one.
                el = buf.errorList("Parse");
@@ -1974,8 +1985,9 @@ void BufferView::menuInsertLyXFile(string const & filenm)
                cap::pasteParagraphList(d->cursor_, buf.paragraphs(),
                                             buf.params().getTextClassPtr(), el);
                res = _("Document %1$s inserted.");
-       } else
+       } else {
                res = _("Could not insert document %1$s");
+       }
 
        // emit message signal.
        message(bformat(res, disp_fn));