Fix bug #6556: Exporting .lyx to .lyx15 or lyx16 report error, yet succeeds.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33557 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 5fc6df0eed897c4f9cf2eb4d391dc33f88664b83..84759a32dce5a17fef55a7fd1810acc67398891b 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1891,9 +1891,10 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                        setReadonly(!isReadonly());
                break;
 
+       //FIXME: This is now handled in GuiView
        case LFUN_BUFFER_EXPORT: {
                bool success = doExport(argument, false, false);
-               dr.setError(success);
+               dr.setError(!success);
                if (!success)
                        dr.setMessage(bformat(_("Error exporting to format: %1$s."), 
                                              func.argument()));

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 279384057d895a9ed3c3d33c5d801f8ee885b91a..13056eba5c0aeb84b6375654e818455d57182e31 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2775,7 +2775,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                                         dr);
                                break;
                        }
-                       if (doc_buffer->doExport(argument, false)) {
+                       if (!doc_buffer->doExport(argument, false)) {
                                dr.setError(true);
                                dr.setMessage(bformat(_("Error exporting to format: %1$s."),
                                        cmd.argument()));