39 to go

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index a5f9cdba16fb6c0fc9f31321d3a99af8682b12c6..dc47b425877ecfab87d432657ddfb3a138926fc2 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -24,12 +24,12 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "bufferview_funcs.h"
 #include "Color.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
+#include "Layout.h"
 #include "Length.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -1281,7 +1281,8 @@ Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
        int yy = pm.position() - pm.ascent();
        BOOST_ASSERT(!pm.rows().empty());
        RowList::const_iterator rit = pm.rows().begin();
-       RowList::const_iterator const rlast = boost::prior(pm.rows().end());
+       RowList::const_iterator rlast = pm.rows().end();
+       --rlast;
        for (; rit != rlast; yy += rit->height(), ++rit)
                if (yy + rit->height() > y)
                        break;
@@ -1999,7 +2000,7 @@ void TextMetrics::drawSelection(PainterInfo & pi,
        if (clipAbove)
                middleTop = 0;
        else
-               middleTop = bv_funcs::getPos(*bv_, beg, beg.boundary()).y_ + row1.descent();
+               middleTop = bv_->getPos(beg, beg.boundary()).y_ + row1.descent();
        
        // clip below
        int middleBottom;
@@ -2007,7 +2008,7 @@ void TextMetrics::drawSelection(PainterInfo & pi,
        if (clipBelow)
                middleBottom = bv_->workHeight();
        else
-               middleBottom = bv_funcs::getPos(*bv_, end, end.boundary()).y_ - row2.ascent();
+               middleBottom = bv_->getPos(end, end.boundary()).y_ - row2.ascent();
 
        // start and end in the same line?
        if (!clipAbove && !clipBelow && &row1 == &row2)
@@ -2051,7 +2052,7 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
        DocIterator cur = beg;
        int x1 = cursorX(beg.top(), beg.boundary());
        int x2 = cursorX(end.top(), end.boundary());
-       int y1 = bv_funcs::getPos(*bv_, cur, cur.boundary()).y_ - row.ascent();
+       int y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
        int y2 = y1 + row.height();
        
        // draw the margins