Accelerators

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 26156fa100b48ae8fa439bacbe08f4d0c831dcf5..6484967fe08d840b96f1924fe7377a417e9a3701 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -33,6 +33,9 @@ class Text;
 /// A map from a Text to the map of paragraphs metrics
 class TextMetrics
 {
+       /// noncopyable
+       TextMetrics(TextMetrics const &);
+       void operator=(TextMetrics const &);
 public:
        /// Default constructor (only here for STL containers).
        TextMetrics() : bv_(0), text_(0), max_width_(0) {}
@@ -57,9 +60,11 @@ public:
        ///
        Point const & origin() const { return origin_; }
 
-
        ///
        ParagraphMetrics const & parMetrics(pit_type) const;
+       ///
+       ParagraphMetrics & parMetrics(pit_type);
+
        ///
        void newParMetricsDown();
        ///
@@ -118,6 +123,15 @@ public:
        /// current text height.
        int height() const { return dim_.height(); }
 
+       /**
+        * Returns the left beginning of the text.
+        * This information cannot be taken from the layout object, because
+        * in LaTeX the beginning of the text fits in some cases
+        * (for example sections) exactly the label-width.
+        */
+       int leftMargin(pit_type pit, pos_type pos) const;
+       int leftMargin(pit_type pit) const;
+
        ///
        int rightMargin(ParagraphMetrics const & pm) const;
        int rightMargin(pit_type const pit) const;
@@ -131,15 +145,6 @@ private:
        ///
        ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
 
-       /**
-        * Returns the left beginning of the text.
-        * This information cannot be taken from the layout object, because
-        * in LaTeX the beginning of the text fits in some cases
-        * (for example sections) exactly the label-width.
-        */
-       int leftMargin(pit_type pit, pos_type pos) const;
-       int leftMargin(pit_type pit) const;
-
        /// the minimum space a manual label needs on the screen in pixels
        int labelFill(Row const & row) const;
 
@@ -237,7 +242,6 @@ public:
                Dimension & dim) const;
 
 private:
-       friend class BufferView;
 
        /// The BufferView owner.
        BufferView * bv_;