This should be the last of the commits refactoring the InsetLayout code.

[lyx.git] / src / insets / InsetText.cpp

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 21cc96bb41b7a1e7f73621887e94cdace7445828..0e8f3ad5715f8bc42f3d32a99f235e91740b4e46 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -79,7 +79,7 @@ public:
        }
        ///
        virtual docstring data(size_t idx) const {
-               std::set<docstring>::iterator it
+               std::set<docstring>::const_iterator it
                = buf_.registeredWords().begin();
                for (size_t i = 0; i < idx; ++i)
                        it++;
@@ -88,7 +88,7 @@ public:
 
 private:
        Buffer const & buf_;
-       std::set<docstring>::iterator const it_;
+       std::set<docstring>::const_iterator const it_;
        size_t pos_;
 };
 
@@ -481,7 +481,7 @@ bool InsetText::completionSupported(Cursor const & cur) const
                return false;
        Paragraph const & par = cur.paragraph();
        return cur.pos() > 0
-               && !par.isLetter(cur.pos())
+               && (cur.pos() >= par.size() || !par.isLetter(cur.pos()))
                && par.isLetter(cur.pos() - 1);
 }
 
@@ -504,12 +504,12 @@ bool InsetText::automaticPopupCompletion() const
 }
 
 
-Inset::CompletionListPtr InsetText::completionList(Cursor const & cur) const
+Inset::CompletionList const * InsetText::completionList(Cursor const & cur) const
 {
        if (!completionSupported(cur))
-               return CompletionListPtr();
+               return 0;
 
-       return CompletionListPtr(new TextCompletionList(cur));
+       return new TextCompletionList(cur);
 }