anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warnings.

Browse Source
This commit is contained in:
Richard Heck 2014-10-27 10:41:44 -04:00
parent a1add5e804
commit 8b57600a1c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Row.cpp
View File

@ -383,7 +383,7 @@ void Row::shortenIfNeeded(pos_type const keep, int const w)
// We have found a suitable separator. This is the // We have found a suitable separator. This is the
// common case. // common case.
end_ = last_sep->endpos; end_ = last_sep->endpos;
dim_.wid = last_width; dim_.wid = int(last_width);
elements_.erase(last_sep, end); elements_.erase(last_sep, end);
return; return;
} }
@ -405,7 +405,7 @@ void Row::shortenIfNeeded(pos_type const keep, int const w)
// There is no separator, but several elements (probably // There is no separator, but several elements (probably
// insets) have been added. We can cut at this place. // insets) have been added. We can cut at this place.
end_ = cit->pos; end_ = cit->pos;
dim_.wid = wid; dim_.wid = int(wid);
elements_.erase(cit, end); elements_.erase(cit, end);
return; return;
} }

2
src/TextMetrics.cpp
View File

@ -804,7 +804,7 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit
row.clear(); row.clear();
// This make get changed in computeRowMetrics depending on RTL // This make get changed in computeRowMetrics depending on RTL
row.x = leftMargin(max_width_, pit, pos); row.x = leftMargin(max_width_, pit, pos);
row.dimension().wid = row.x; row.dimension().wid = int(row.x);
row.right_margin = right_margin; row.right_margin = right_margin;
if (pos >= end || row.width() > width) { if (pos >= end || row.width() > width) {