anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-21 07:12:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix crash + shut up warning

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20011 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Alfredo Braunstein 2007-09-02 18:05:37 +00:00
parent 34b2999879
commit 052e9071e9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/TextMetrics.cpp
View File

@ -155,7 +155,7 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim)
Dimension const old_dim = dim_; Dimension const old_dim = dim_;
// reset dimension. // reset dimension.
dim_ = Dimension(); dim_ = Dimension();
size_t npar = text_->paragraphs().size(); pit_type const npar = text_->paragraphs().size();
if (npar > 1) if (npar > 1)
// If there is more than one row, expand the text to // If there is more than one row, expand the text to
// the full allowable width. // the full allowable width.
@ -1776,10 +1776,14 @@ void TextMetrics::drawSelection(PainterInfo & pi, int x, int) const
|| bv_funcs::status(bv_, end) == bv_funcs::CUR_ABOVE) || bv_funcs::status(bv_, end) == bv_funcs::CUR_ABOVE)
return; return;
if (beg.pit() < par_metrics_.begin()->first) if (beg.pit() < par_metrics_.begin()->first) {
beg.pit() = par_metrics_.begin()->first; beg.pit() = par_metrics_.begin()->first;
if (end.pit() > par_metrics_.rbegin()->first) beg.pos() = 0;
}
if (end.pit() > par_metrics_.rbegin()->first) {
end.pit() = par_metrics_.rbegin()->first; end.pit() = par_metrics_.rbegin()->first;
end.pos() = end.lastpos();
}
ParagraphMetrics const & pm1 = par_metrics_[beg.pit()]; ParagraphMetrics const & pm1 = par_metrics_[beg.pit()];
ParagraphMetrics const & pm2 = par_metrics_[end.pit()]; ParagraphMetrics const & pm2 = par_metrics_[end.pit()];