Move isMultiCell() to Cursor, and use it.

[lyx.git] / src / insets / InsetNomencl.cpp

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 10aef0f51d62d63f2bbbd857fc8cff8bbef4a2f7..e063795760c29b9bc1392cc4f60e46e4f2a270cd 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -16,13 +16,13 @@
 #include "Buffer.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "InsetIterator.h"
 #include "LaTeXFeatures.h"
 #include "MetricsInfo.h"
 #include "sgml.h"
 
 #include "support/docstream.h"
+#include "support/gettext.h"
 
 using namespace std;
 
@@ -119,13 +119,13 @@ int InsetPrintNomencl::docbook(odocstream & os, OutputParams const &) const
 {
        os << "<glossary>\n";
        int newlines = 2;
-       for (InsetIterator it = inset_iterator_begin(buffer().inset()); it;) {
+       InsetIterator it = inset_iterator_begin(buffer().inset());
+       while (it) {
                if (it->lyxCode() == NOMENCL_CODE) {
                        newlines += static_cast<InsetNomencl const &>(*it).docbookGlossary(os);
                        ++it;
-               } else if(it->lyxCode() == NOTE_CODE &&
-                         static_cast<InsetNote const &>(*it).params().type == InsetNoteParams::Note) {
-                       // Don't output anything nested in note insets
+               } else if (!it->producesOutput()) {
+                       // Ignore contents of insets that are not in output
                        size_t const depth = it.depth();
                        ++it;
                        while (it.depth() > depth)