Cleanup bv-dependent variables in InsetCollapsable

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

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 4489270d4e4812e480f3b9fb432b669f0716b3ec..a2466c8ac10753ab6a2a96498b5129c3ba85a9e1 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -244,8 +244,8 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const & op) const
        // FIXME What we'd really like to do is to be able to output some
        // appropriate sort of text here. But to do that, we need to associate
        // some sort of counter with the label, and we don't have that yet.
-       string const attr = "href=\"#" + html::cleanAttr(to_utf8(ref)) + "\"";
-       xs << html::StartTag("a", attr);
+       docstring const attr = "href=\"#" + html::cleanAttr(ref) + '"';
+       xs << html::StartTag("a", to_utf8(attr));
        xs << display_string;
        xs << html::EndTag("a");
        return docstring();
@@ -260,7 +260,7 @@ void InsetRef::toString(odocstream & os) const
 }
 
 
-void InsetRef::forOutliner(docstring & os, size_t) const
+void InsetRef::forOutliner(docstring & os, size_t const, bool const) const
 {
        // There's no need for details in the TOC, and a long label
        // will just get in the way.
@@ -288,18 +288,13 @@ void InsetRef::updateBuffer(ParIterator const & it, UpdateType)
                label += getParam("name");
        }
        
-       screen_label_ = label;
-       bool shortened = false;
        unsigned int const maxLabelChars = 24;
-       if (screen_label_.size() > maxLabelChars) {
-               screen_label_.erase(maxLabelChars - 3);
-               screen_label_ += "...";
-               shortened = true;
-       }
-       if (shortened)
+       if (label.size() > maxLabelChars) {
                tooltip_ = label;
-       else 
+               support::truncateWithEllipsis(label, maxLabelChars);
+       } else
                tooltip_ = from_ascii("");
+       screen_label_ = label;
 }