compil fix for Qt-4.2

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index fe8e4c34c67e4b582cfa38c99d6d5881107c16bc..5870b0476c2bb9df485724da0c3f14815f952484 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -69,7 +69,6 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
-#include "support/FileFilterList.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -114,7 +113,7 @@ bool findNextInset(DocIterator & dit, vector<InsetCode> const & codes,
        while (tmpdit) {
                Inset const * inset = tmpdit.nextInset();
                if (inset
-                   && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
+                   && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
                    && (contents.empty() ||
                    static_cast<InsetCommand const *>(inset)->getFirstNonOptParam() == contents)) {
                        dit = tmpdit;
@@ -140,7 +139,7 @@ bool findInset(DocIterator & dit, vector<InsetCode> const & codes,
        if (same_content) {
                Inset const * inset = tmpdit.nextInset();
                if (inset
-                   && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
+                   && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
                        contents = static_cast<InsetCommand const *>(inset)->getFirstNonOptParam();
                }
        }
@@ -1564,7 +1563,7 @@ void BufferView::gotoLabel(docstring const & label)
        for (InsetIterator it = inset_iterator_begin(buffer_.inset()); it; ++it) {
                vector<docstring> labels;
                it->getLabelList(buffer_, labels);
-               if (find(labels.begin(), labels.end(), label) != labels.end()) {
+               if (std::find(labels.begin(), labels.end(), label) != labels.end()) {
                        setCursor(it);
                        showCursor();
                        return;
@@ -1777,6 +1776,19 @@ void BufferView::updateMetrics()
        // Rebreak anchor paragraph.
        tm.redoParagraph(d->anchor_pit_);
        ParagraphMetrics & anchor_pm = tm.par_metrics_[d->anchor_pit_];
+       
+       // position anchor
+       if (d->anchor_pit_ == 0) {
+               int scrollRange = d->scrollbarParameters_.max - d->scrollbarParameters_.min;
+               
+               // Complete buffer visible? Then it's easy.
+               if (scrollRange == 0)
+                       d->anchor_ypos_ = anchor_pm.ascent();
+       
+               // FIXME: Some clever handling needed to show
+               // the _first_ paragraph up to the top if the cursor is
+               // in the first line.
+       }               
        anchor_pm.setPosition(d->anchor_ypos_);
 
        LYXERR(Debug::PAINTING, "metrics: "