Revert r35715. Didn't mean to commit both.

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

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index c9277d642f9f88e2e3c522d66208190382ed4076..b2c3d8ddd8ec5c20a011ed596ba0ab4c847410ce 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -70,7 +70,6 @@
 #include "insets/InsetBibtex.h"
 #include "insets/InsetBranch.h"
 #include "insets/InsetInclude.h"
-#include "insets/InsetTabular.h"
 #include "insets/InsetText.h"
 
 #include "mathed/InsetMathHull.h"
@@ -2733,17 +2732,6 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
                                it.pop_back();
                                continue;
                        }
-                       
-                       if (iit->inset->asInsetTabular()) {
-                               CursorSlice slice(*iit->inset);
-                               size_t const numcells = slice.nargs();
-                               for (; slice.idx() < numcells; slice.forwardIdx()) {
-                                       it.push_back(slice);
-                                       updateMacros(it, scope);
-                                       it.pop_back();
-                               }
-                               continue;
-                       }
 
                        // is it an external file?
                        if (iit->inset->lyxCode() == INCLUDE_CODE) {

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 1e499ce139afd768b6c3ba6cefde61e3e0d83610..724e4f4f47ff10ebac72a82565e26289133acc5e 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -367,7 +367,6 @@ public:
        static QSet<Buffer const *> busyBuffers;
        static docstring previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
        static docstring exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
-       static docstring compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
        static docstring saveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname);
 
        // TODO syncFunc/previewFunc: use bind
@@ -2815,26 +2814,12 @@ bool GuiView::goToFileRow(string const & argument)
 
 
 #if (QT_VERSION >= 0x040400)
-docstring GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
-{
-       bool const update_unincluded =
-                               buffer->params().maintain_unincluded_children
-                               && !buffer->params().getIncludedChildren().empty();
-       bool const success = buffer->doExport(format, true, update_unincluded);
-       delete buffer;
-       busyBuffers.remove(orig);
-       return success
-               ? bformat(_("Successful compilation to format: %1$s"), from_utf8(format))
-               : bformat(_("Error compiling format: %1$s"), from_utf8(format));
-}
-
-
 docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
 {
        bool const update_unincluded =
                                buffer->params().maintain_unincluded_children
                                && !buffer->params().getIncludedChildren().empty();
-       bool const success = buffer->doExport(format, false, update_unincluded);
+       bool const success = buffer->doExport(format, true, update_unincluded);
        delete buffer;
        busyBuffers.remove(orig);
        return success
@@ -2966,7 +2951,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        d.asyncBufferProcessing(argument,
                                                doc_buffer,
                                                _("Exporting ..."),
-                                               &GuiViewPrivate::compileAndDestroy,
+                                               &GuiViewPrivate::exportAndDestroy,
                                                &Buffer::doExport,
                                                0);
                        break;
@@ -2984,7 +2969,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        d.asyncBufferProcessing(argument,
                                                (doc_buffer ? doc_buffer->masterBuffer() : 0),
                                                docstring(),
-                                               &GuiViewPrivate::compileAndDestroy,
+                                               &GuiViewPrivate::exportAndDestroy,
                                                &Buffer::doExport,
                                                0);
                        break;