zlib stuff

[lyx.git] / src / rowpainter.C

diff --git a/src/rowpainter.C b/src/rowpainter.C
index d61471fb2684d30adbb093ad2f942a8b7061bd4a..86bb5f5eb0180345eaed62de1746a6a8788c9b21 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -139,7 +139,7 @@ RowPainter::RowPainter(BufferView const & bv, LyXText const & text,
 /// "temporary"
 LyXFont const RowPainter::getFont(pos_type pos) const
 {
-       return text_.getFont(bv_.buffer(), pit_, pos);
+       return text_.getFont(pit_, pos);
 }
 
 
@@ -157,7 +157,7 @@ int RowPainter::singleWidth(lyx::pos_type pos, char c) const
 
 LyXFont const RowPainter::getLabelFont() const
 {
-       return text_.getLabelFont(bv_.buffer(), pit_);
+       return text_.getLabelFont(pit_);
 }
 
 
@@ -1076,20 +1076,20 @@ void paintRows(BufferView const & bv, LyXText const & text,
        // calling metrics() directly is (a) slow and (b) crashs
        if (&text == bv.text) {
 #if 1
-               lyxerr << "paintRows, global...\n";
                // make sure all insets are updated
                ParagraphList::iterator pit = text.ownerParagraphs().begin();
                ParagraphList::iterator end = text.ownerParagraphs().end();
 
                // compute inset metrics
                for (; pit != end; ++pit) {
-                       for (int pos = 0; pos != pit->size(); ++pos) {
-                               if (pit->isInset(pos)) {
-                                       Dimension dim;
-                                       LyXFont font;
-                                       MetricsInfo mi(perv(bv), font, text.workWidth());
-                                       pit->getInset(pos)->metrics(mi, dim);
-                               }
+                       InsetList & insetList = pit->insetlist;
+                       InsetList::iterator ii = insetList.begin();
+                       InsetList::iterator iend = insetList.end();
+                       for (; ii != iend; ++ii) {
+                               Dimension dim;
+                               LyXFont font;
+                               MetricsInfo mi(perv(bv), font, text.workWidth());
+                               ii->inset->metrics(mi, dim);
                        }
                }
 #else