prepare for 1.1.6pre2

[lyx.git] / src / insets / insetlabel.C

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 2aa37e0efd93af30483e363bef8fd790a429d5cf..80428c3b67c8d32db976cca5d35ad7fc78a29f2a 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -33,7 +33,7 @@ InsetLabel::InsetLabel(InsetCommandParams const & p)
 {}
 
 
-vector<string> InsetLabel::getLabelList() const
+vector<string> const InsetLabel::getLabelList() const
 {
        return vector<string>(1,getContents());
 }
@@ -57,8 +57,7 @@ void InsetLabel::Edit(BufferView * bv, int, int, unsigned int)
                        bv->text->RedoParagraph(bv);
                        if (flag) {
                                bv->redraw();
-                               bv->fitCursor();
-                               //bv->updateScrollbar();
+                               bv->fitCursor(getLyXText(bv));
                        } else
                                bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                }
@@ -73,7 +72,7 @@ int InsetLabel::Latex(Buffer const *, ostream & os,
        return 0;
 }
 
-int InsetLabel::Ascii(Buffer const *, ostream & os) const
+int InsetLabel::Ascii(Buffer const *, ostream & os, int) const
 {
        os << "<" << getContents()  << ">";
        return 0;
@@ -89,14 +88,14 @@ int InsetLabel::Linuxdoc(Buffer const *, ostream & os) const
 
 int InsetLabel::DocBook(Buffer const *, ostream & os) const
 {
-       os << "<anchor id=\"" << getContents() << "\" >";
+       os << "<anchor id=\"" << getContents() << "\" ></anchor>";
        return 0;
 }
 
 
 // This function escapes 8-bit characters and other problematic characters
 // It's exactly the same code as in insetref.C.
-string InsetLabel::escape(string const & lab) const {
+string const InsetLabel::escape(string const & lab) const {
        char hexdigit[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
                              '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
        string enc;