John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index de831a0d210f461e9f038c4f6cf20cbc890b60f1..f3d909649e8f03c35b834bf8cb517e8d661d5545 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -14,35 +14,38 @@
 #pragma implementation
 #endif
 
-#include <algorithm>
-#include <fstream>
-#include <csignal>
-
 #include "paragraph.h"
 #include "paragraph_pimpl.h"
-#include "support/textutils.h"
 #include "lyxrc.h"
 #include "layout.h"
 #include "language.h"
 #include "tex-strings.h"
 #include "buffer.h"
 #include "bufferparams.h"
-#include "support/FileInfo.h"
-#include "support/LAssert.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
-#include "insets/insetinclude.h"
-#include "insets/insetbib.h"
-#include "insets/insettext.h"
-#include "support/filetools.h"
-#include "support/lstrings.h"
 #include "lyx_gui_misc.h"
 #include "texrow.h"
-#include "support/lyxmanip.h"
 #include "BufferView.h"
 #include "encoding.h"
 #include "ParameterStruct.h"
 #include "gettext.h"
+#include "lyxtextclasslist.h"
+
+#include "insets/insetinclude.h"
+#include "insets/insetbib.h"
+#include "insets/insettext.h"
+
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/lyxmanip.h"
+#include "support/FileInfo.h"
+#include "support/LAssert.h"
+#include "support/textutils.h"
+
+#include <algorithm>
+#include <fstream>
+#include <csignal>
 
 using std::ostream;
 using std::endl;
@@ -716,8 +719,7 @@ Paragraph::highestFontInRange(pos_type startpos, pos_type endpos,
 
 
 Paragraph::value_type
-Paragraph::getUChar(BufferParams const & bparams,
-                      pos_type pos) const
+Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 {
        value_type c = getChar(pos);
        if (!lyxrc.rtl_support)
@@ -757,8 +759,7 @@ Paragraph::getUChar(BufferParams const & bparams,
 }
 
 
-void Paragraph::setFont(pos_type pos,
-                          LyXFont const & font)
+void Paragraph::setFont(pos_type pos, LyXFont const & font)
 {
        lyx::Assert(pos <= size());
 
@@ -1190,22 +1191,6 @@ Paragraph const * Paragraph::outerHook() const
        return depthHook(depth_type(getDepth() - 1));
 }
 
-int Paragraph::autoDeleteInsets()
-{
-       int count = 0;
-       InsetList::size_type index = 0;
-       while (index < insetlist.size()) {
-               if (insetlist[index].inset && insetlist[index].inset->autoDelete()) {
-                       erase(insetlist[index].pos); 
-                       // erase() calls to insetlist.erase(&insetlist[index])
-                       // so index shouldn't be increased.
-                       ++count;
-               } else
-                       ++index;
-       }
-       return count;
-}
-
 
 Paragraph::inset_iterator
 Paragraph::InsetIterator(pos_type pos)
@@ -1477,8 +1462,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                basefont = getLayoutFont(bparams);
        }
 
-       if (main_body >= 0
-           && !pimpl_->size()) {
+       if (main_body >= 0 && !pimpl_->size()) {
                if (style.isCommand()) {
                        os << '{';
                        ++column;
@@ -1803,8 +1787,7 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
        }
        Paragraph * par = this;
        do {
-               par = par->TeXOnePar(buf, bparams,
-                                    os, texrow, false);
+               par = par->TeXOnePar(buf, bparams, os, texrow, false);
 
                if (par && par->params().depth() > params().depth()) {
                        if (textclasslist.Style(bparams.textclass,