* src/Text.cpp:

	- safer (but slightly less nice) fix for bug 4334. Fixes bug 4347 that was introduced in r21489.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21541 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Text.cpp b/src/Text.cpp
index 88341f6f97d8d62aab76e87fcfaafc91f7d9e6a0..bf77a0c251b3459df34868bf16f54bf8d59108ae 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -86,8 +86,8 @@ namespace lyx {
 
 using support::bformat;
 using support::contains;
-using support::rsplit;
 using support::split;
+using support::subst;
 
 using cap::cutSelection;
 using cap::pasteParagraphList;
@@ -1278,8 +1278,7 @@ docstring Text::getPossibleLabel(Cursor & cur) const
        docstring par_text = pars_[pit].asString(cur.buffer(), false);
        string piece;
        // the return string of math matrices might contain linebreaks
-       // FIXME: unicode
-       par_text = from_utf8(rsplit(to_utf8(par_text), piece, '\n'));
+       par_text = subst(par_text, '\n', '-');
        for (int i = 0; i < lyxrc.label_init_length; ++i) {
                if (par_text.empty())
                        break;