Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

[features.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 12f387d18f37e3680a15b69552387a41cee41e99..fc71943377ce0f76c7d9140e50ecec7bfaa22a12 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -203,7 +203,7 @@ int ParagraphMetrics::rightMargin(BufferView const & bv) const
        int const r_margin =
                bv.rightMargin()
                + fm.signedWidth(tclass.rightmargin())
-               + fm.signedWidth(par_->layout()->rightmargin)
+               + fm.signedWidth(par_->layout().rightmargin)
                * 4 / (par_->getDepth() + 4);
 
        return r_margin;
@@ -260,7 +260,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        }
 
        // do not expand in some labels
-       if (par_->layout()->margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
+       if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
                return false;
 
        // if there is anything between the first char of the row and