Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / ParagraphMetrics.h

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index a100651957d0c4714c146bc3d7d655f11b383bd0..7244e2a2d34b1a48b8e43463a1145f22ed3c0840 100644 (file)
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -45,7 +45,7 @@ class PainterInfo;
 class ParagraphMetrics {
 public:
        /// Default constructor (only here for STL containers).
-       ParagraphMetrics() : par_(0) {}
+       ParagraphMetrics() : position_(0), par_(0) {}
        /// The only useful constructor.
        explicit ParagraphMetrics(Paragraph const & par);
 
@@ -78,8 +78,6 @@ public:
        RowList const & rows() const { return rows_; }
        ///
        int rightMargin(BufferView const & bv) const;
-       ///
-       int singleWidth(pos_type pos, Font const & Font) const;
 
        /// dump some information to lyxerr
        void dump() const;
@@ -87,18 +85,13 @@ public:
        ///
        bool hfillExpansion(Row const & row, pos_type pos) const;
 
-       /// 
-       size_t computeRowSignature(Row const &, BufferParams const & bparams) const;
+       ///
+       size_t computeRowSignature(Row const &, BufferView const & bv) const;
 
        ///
        int position() const { return position_; }
        void setPosition(int position);
 
-       ///
-       Dimension const & insetDimension(Inset const * inset) const;
-       ///
-       void setInsetDimension(Inset const *, Dimension const & dim);
-
 private:
        ///
        int position_;
@@ -108,10 +101,6 @@ private:
        Dimension dim_;
        ///
        Paragraph const * par_;
-       
-       typedef std::map<Inset const *, Dimension> InsetDims;
-       ///
-       InsetDims inset_dims_;
 };
 
 } // namespace lyx