fix warning

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index d3ef713338b15b6ad0fbce480339088f8fdd508f..2baa9b922e9ae4703fd3524f86c776835c5c56a8 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -52,6 +52,7 @@
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/ExceptionMessage.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"
@@ -175,7 +176,7 @@ public:
        Paragraph * owner_;
 
        /// In which Inset?
-       Inset * inset_owner_;
+       Inset const * inset_owner_;
 
        ///
        FontList fontlist_;
@@ -251,8 +252,9 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner)
 
 Paragraph::Private::Private(Private const & p, Paragraph * owner,
        pos_type beg, pos_type end)
-       : owner_(owner), inset_owner_(p.inset_owner_), fontlist_(p.fontlist_), 
+       : owner_(owner), inset_owner_(p.inset_owner_),
          params_(p.params_), changes_(p.changes_),
+         insetlist_(p.insetlist_, beg, end),
          begin_of_body_(p.begin_of_body_), words_(p.words_),
          layout_(p.layout_)
 {
@@ -260,16 +262,7 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner,
        if (beg >= pos_type(p.text_.size()))
                return;
        text_ = p.text_.substr(beg, end - beg);
-       InsetList::const_iterator icit = p.insetlist_.begin();
-       InsetList::const_iterator iend = p.insetlist_.end();
-       for (; icit != iend; ++icit) {
-               if (icit->pos < beg)
-                       continue;
-               if (icit->pos >= end)
-                       break;
-               // Add a new entry in the insetlist_.
-               insetlist_.insert(icit->inset, icit->pos - beg);
-       }
+
        FontList::const_iterator fcit = fontlist_.begin();
        FontList::const_iterator fend = fontlist_.end();
        for (; fcit != fend; ++fcit) {
@@ -465,7 +458,7 @@ void Paragraph::insertInset(pos_type pos, Inset * inset,
 
 bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
 {
-       LASSERT(pos >= 0 && pos <= size(), /**/);
+       LASSERT(pos >= 0 && pos <= size(), return false);
 
        // keep the logic here in sync with the logic of isMergedOnEndOfParDeletion()
 
@@ -980,6 +973,11 @@ bool Paragraph::Private::latexSpecialT1(char_type const c, odocstream & os,
        case '|':
                os.put(c);
                return true;
+       case '\"':
+               // soul.sty breaks with \char`\"
+               os << "\\textquotedbl{}";
+               column += 14;
+               return true;
        default:
                return false;
        }
@@ -1307,12 +1305,6 @@ void Paragraph::insertInset(pos_type pos, Inset * inset,
 }
 
 
-bool Paragraph::insetAllowed(InsetCode code)
-{
-       return !d->inset_owner_ || d->inset_owner_->insetAllowed(code);
-}
-
-
 void Paragraph::resetFonts(Font const & font)
 {
        d->fontlist_.clear();
@@ -1665,28 +1657,19 @@ void Paragraph::setBeginOfBody()
 
 bool Paragraph::forcePlainLayout() const
 {
-       Inset const * const inset = inInset();
-       if (!inset)
-               return true;
-       return inset->forcePlainLayout();
+       return inInset().forcePlainLayout();
 }
 
 
 bool Paragraph::allowParagraphCustomization() const
 {
-       Inset const * const inset = inInset();
-       if (!inset)
-               return true;
-       return inset->allowParagraphCustomization();
+       return inInset().allowParagraphCustomization();
 }
 
 
 bool Paragraph::usePlainLayout() const
 {
-       Inset const * const inset = inInset();
-       if (!inset)
-               return false;
-       return inset->usePlainLayout();
+       return inInset().usePlainLayout();
 }
 
 
@@ -1883,7 +1866,7 @@ bool Paragraph::latex(BufferParams const & bparams,
        bool asdefault = forcePlainLayout();
 
        Layout const & style = asdefault ?
-               bparams.documentClass().emptyLayout() :
+               bparams.documentClass().plainLayout() :
                *d->layout_;
 
        // Current base font for all inherited font changes, without any
@@ -2399,7 +2382,7 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
 }
 
 
-void Paragraph::setInsetOwner(Inset * inset)
+void Paragraph::setInsetOwner(Inset const * inset)
 {
        d->inset_owner_ = inset;
 }
@@ -2426,15 +2409,17 @@ void Paragraph::setLayout(Layout const & layout)
 void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass)
 {
        if (usePlainLayout())
-               setLayout(tclass.emptyLayout());
+               setLayout(tclass.plainLayout());
        else
                setLayout(tclass.defaultLayout());
 }
 
 
-Inset * Paragraph::inInset() const
+Inset const & Paragraph::inInset() const
 {
-       return d->inset_owner_;
+       LASSERT(d->inset_owner_, throw ExceptionMessage(BufferException,
+               _("Memory problem"), _("Paragraph not properly initiliazed")));
+       return *d->inset_owner_;
 }