#include "sgml.h"
#include "TextClass.h"
#include "TexRow.h"
-#include "VSpace.h"
#include "frontends/FontMetrics.h"
#include "insets/InsetBibitem.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
#include "support/lassert.h"
#include "support/debug.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <boost/crc.hpp>
#include <algorithm>
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};
- // Each of the variable to process is 4 bytes: 4x7 = 28
- crc.process_bytes(b, 28);
+ crc.process_bytes(b, sizeof(b));
return crc.checksum();
}
c = par_->transformChar(c, pos);
} else if (language->lang() == "hebrew" &&
Encodings::isHebrewComposeChar(c)) {
- return 0;
+ return 0;
}
}
return theFontMetrics(font).width(c);
}
// 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())