Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 95974f5705a578d3d032cb352c5496ade545c76c..d4ff656449ace627c47a9365e8bd51bb122f6da9 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -34,7 +34,6 @@
 #include "sgml.h"
 #include "TextClass.h"
 #include "TexRow.h"
-#include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
 
@@ -43,6 +42,7 @@
 
 #include "support/lassert.h"
 #include "support/debug.h"
+#include "support/ExceptionMessage.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
@@ -94,14 +94,15 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
                crc.process_bytes(b, sizeof(char_type));
                if (bparams.trackChanges) {
                        Change change = par_->lookupChange(i);
-                       char_type const b[] = { change.type };
+                       char_type const b[] = { static_cast<char_type>(change.type) };
                        // 1 byte is enough to encode Change::Type
                        crc.process_bytes(b, 1);
                }                       
        }
 
        Dimension const & d = row.dimension();
-       char_type const b[] = { row.sel_beg, row.sel_end, 
+       char_type const b[] = { static_cast<char_type>(row.sel_beg),
+                               static_cast<char_type>(row.sel_end),
                row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des};
        crc.process_bytes(b, sizeof(b));
 
@@ -135,7 +136,7 @@ void ParagraphMetrics::setInsetDimension(Inset const * inset,
 
 Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 {
-       LASSERT(!rows().empty(), /**/);
+       LBUFERR(!rows().empty());
 
        // If boundary is set we should return the row on which
        // the character before is inside.
@@ -154,7 +155,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
-       LASSERT(!rows().empty(), /**/);
+       LBUFERR(!rows().empty());
 
        // If boundary is set we should return the row on which
        // the character before is inside.
@@ -173,7 +174,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 
 size_t ParagraphMetrics::pos2row(pos_type pos) const
 {
-       LASSERT(!rows().empty(), /**/);
+       LBUFERR(!rows().empty());
 
        RowList::const_iterator rit = rows_.end();
        RowList::const_iterator const begin = rows_.begin();
@@ -245,7 +246,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        if (!par_->isHfill(pos))
                return false;
 
-       LASSERT(pos >= row.pos() && pos < row.endpos(), /**/);
+       LASSERT(pos >= row.pos() && pos < row.endpos(), return false);
 
        // expand at the end of a row only if there is another hfill on the same row
        if (pos == row.endpos() - 1) {
@@ -257,9 +258,8 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        }
 
        // expand at the beginning of a row only if it is the first row of a paragraph
-       if (pos == row.pos()) {
+       if (pos == row.pos())
                return pos == 0;
-       }
 
        // do not expand in some labels
        if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())