Hopefully this works on other archs too.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 267e2ebfbecafcb99cab3671256088d8fd1c98ff..6dce930e9a47e2bc0d036e2bbba67a8bece1c86a 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -36,7 +36,6 @@
 #include "OutputParams.h"
 #include "output_latex.h"
 #include "output_xhtml.h"
-#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "SpellChecker.h"
 #include "sgml.h"
@@ -173,6 +172,12 @@ public:
 
        /// match a string against a particular point in the paragraph
        bool isTextAt(string const & str, pos_type pos) const;
+
+
+       InsetCode ownerCode() const
+       {
+               return inset_owner_ ? inset_owner_->lyxCode() : NO_CODE;
+       }
        
        /// Which Paragraph owns us?
        Paragraph * owner_;
@@ -759,7 +764,7 @@ void Paragraph::Private::latexInset(
                column = 0;
        }
 
-       if (owner_->lookupChange(i).deleted()) {
+       if (owner_->isDeleted(i)) {
                if( ++runparams.inDeletedInset == 1)
                        runparams.changeOfDeletedInset = owner_->lookupChange(i);
        }
@@ -848,7 +853,7 @@ void Paragraph::Private::latexInset(
                column += os.tellp() - len;
        }
 
-       if (owner_->lookupChange(i).deleted())
+       if (owner_->isDeleted(i))
                --runparams.inDeletedInset;
 }
 
@@ -1695,12 +1700,6 @@ void Paragraph::setBeginOfBody()
 }
 
 
-bool Paragraph::forcePlainLayout() const
-{
-       return inInset().forcePlainLayout();
-}
-
-
 bool Paragraph::allowParagraphCustomization() const
 {
        return inInset().allowParagraphCustomization();
@@ -1807,7 +1806,7 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
        }
 
        string const begin_tag = "\\begin";
-       InsetCode code = owner_->ownerCode();
+       InsetCode code = ownerCode();
        bool const lastpar = runparams.isLastPar;
 
        switch (curAlign) {
@@ -1875,7 +1874,7 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        }
 
        string const end_tag = "\n\\par\\end";
-       InsetCode code = owner_->ownerCode();
+       InsetCode code = ownerCode();
        bool const lastpar = runparams.isLastPar;
 
        switch (curAlign) {
@@ -1930,7 +1929,7 @@ bool Paragraph::latex(BufferParams const & bparams,
 
        // FIXME This check should not be needed. Perhaps issue an
        // error if it triggers.
-       Layout const & style = forcePlainLayout() ?
+       Layout const & style = inInset().forcePlainLayout() ?
                bparams.documentClass().plainLayout() : *d->layout_;
 
        // Current base font for all inherited font changes, without any
@@ -2641,12 +2640,6 @@ Inset const & Paragraph::inInset() const
 }
 
 
-InsetCode Paragraph::ownerCode() const
-{
-       return d->inset_owner_ ? d->inset_owner_->lyxCode() : NO_CODE;
-}
-
-
 ParagraphParameters & Paragraph::params()
 {
        return d->params_;