Fix coverity issues about exceptions

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index f0abcb520185a1ed4fd4daf721f0f1e16db008f8..ade98739ed8c59d50c18d4f1a5860928fa12f48a 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -35,7 +35,7 @@ class TextMetrics
 {
 public:
        /// Default constructor (only here for STL containers).
-       TextMetrics() : bv_(0), text_(0), main_text_(false), max_width_(0) {}
+       TextMetrics() : bv_(0), text_(0), max_width_(0) {}
        /// The only useful constructor.
        TextMetrics(BufferView *, Text *);
 
@@ -104,9 +104,6 @@ public:
        /// current text height.
        int height() const { return dim_.height(); }
 
-       ///
-       int maxWidth() const { return max_width_; }
-
        ///
        int rightMargin(ParagraphMetrics const & pm) const;
        int rightMargin(pit_type const pit) const;
@@ -116,31 +113,33 @@ public:
 
        void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const;
 
-       /// Returns the height of the row (width member is set to 0).
-       /// If \c topBottomSpace is true, extra space is added for the
-       /// top and bottom row.
-       void setRowHeight(Row & row, pit_type const pit,
-                         bool topBottomSpace = true) const;
-
 private:
        ///
        ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
 
        /// the minimum space a manual label needs on the screen in pixels
-       int labelFill(pit_type const pit, Row const & row) const;
+       int labelFill(Row const & row) const;
 
        /// FIXME??
        int labelEnd(pit_type const pit) const;
 
        /// sets row.end to the pos value *after* which a row should break.
        /// for example, the pos after which isNewLine(pos) == true
-       void breakRow(Row & row, int right_margin, pit_type const pit) const;
+       /// \return true when another row is required (after a newline)
+       bool breakRow(Row & row, int right_margin) const;
 
        // Expand the alignment of row \param row in paragraph \param par
        LyXAlignment getAlign(Paragraph const & par, Row const & row) const;
        /** this calculates the specified parameters. needed when setting
         * the cursor and when creating a visible row */
-       void computeRowMetrics(pit_type pit, Row & row, int width) const;
+       void computeRowMetrics(Row & row, int width) const;
+
+       /// Set the height of the row (without space above/below paragraph)
+       void setRowHeight(Row & row) const;
+       // Compute the space on top of a paragraph
+       int parTopSpacing(pit_type pit) const;
+       // Compute the space below a a paragraph
+       int parBottomSpacing(pit_type pit) const;
 
        // Helper function for the other checkInsetHit method.
        InsetList::InsetTable * checkInsetHit(pit_type pit, int x, int y);
@@ -150,8 +149,9 @@ private:
 public:
        /// returns the position near the specified x-coordinate of the row.
        /// x is an absolute screen coord, it is set to the real beginning
-       /// of this column.
-       pos_type getPosNearX(Row const & row, int & x, bool & boundary) const;
+       /// of this column. This takes in account horizontal cursor row scrolling.
+       pos_type getPosNearX(Row const & row, int & x, bool & boundary,
+                            bool select = false) const;
 
        /// returns pos in given par at given x coord.
        pos_type x2pos(pit_type pit, int row, int x) const;
@@ -189,13 +189,10 @@ public:
 
        /// sets cursor only within this Text.
        /// x,y are screen coordinates
-       void setCursorFromCoordinates(Cursor & cur, int x, int y);
-
-       /// Helper function: find row element that contains pos, and
-       /// compute x offset.
-       Row::const_iterator const
-       findRowElement(Row const & row, pos_type const pos,
-                   bool const boundary, double & x) const;
+       /// If select is true, move to the next position if closer to the right
+       /// edge.
+       void setCursorFromCoordinates(Cursor & cur, int x, int y,
+                                     bool select = false);
 
        ///
        int cursorX(CursorSlice const & cursor, bool boundary) const;
@@ -210,9 +207,9 @@ public:
        void deleteLineForward(Cursor & cur);
 
        /// is this row the last in the text?
-       bool isLastRow(pit_type pit, Row const & row) const;
+       bool isLastRow(Row const & row) const;
        /// is this row the first in the text?
-       bool isFirstRow(pit_type pit, Row const & row) const;
+       bool isFirstRow(Row const & row) const;
 
        /// Returns an inset if inset was hit, or 0 if not.
        /// \warning This method is not recursive! It will return the
@@ -243,7 +240,6 @@ private:
        /// \todo FIXME: this should be const.
        Text * text_;
 
-       bool main_text_;
        /// A map from paragraph index number to paragraph metrics
        typedef std::map<pit_type, ParagraphMetrics> ParMetricsCache;
        ///