Fix bug #6672 (part 1): Notes, Footnotes, and Marginals are unnecessarily truncated.

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index f311c1d61cfc227e57e46da070ed3975875ca322..79167d1dede98d680c20bb106ccc86a462527bb6 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -66,7 +66,7 @@ void InsetFoot::addToToc(DocIterator const & cpit)
 
        Toc & toc = buffer().tocBackend().toc("footnote");
        docstring str;
-       str = custom_label_ + ": " + getNewLabel(str);
+       str = custom_label_ + ": " + text().getPar(0).asString();
        toc.push_back(TocItem(pit, 0, str));
        // Proceed with the rest of the inset.
        InsetFootlike::addToToc(cpit);

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index fe776bed8abeada38709537d6f969abda5d261e8..86b93bd4b74d347577fe76e41c448ec21cf45e0c 100644 (file)
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -58,7 +58,7 @@ void InsetMarginal::addToToc(DocIterator const & cpit)
 
        Toc & toc = buffer().tocBackend().toc("marginalnote");
        docstring str;
-       str = getNewLabel(str);
+       str = text().getPar(0).asString();
        toc.push_back(TocItem(pit, 0, str));
        // Proceed with the rest of the inset.
        InsetFootlike::addToToc(cpit);

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 414b4e691055d38c21374edad371e7ed2ef0c51f..189c290791b9a2470f50045457fa97a23c323e05 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -223,7 +223,7 @@ void InsetNote::addToToc(DocIterator const & cpit)
        Toc & toc = buffer().tocBackend().toc("note");
        docstring str;
        str = notetranslator_loc().find(params_.type) + from_ascii(": ")
-               + getNewLabel(str);
+               + text().getPar(0).asString();
        toc.push_back(TocItem(pit, 0, str));
        // Proceed with the rest of the inset.
        InsetCollapsable::addToToc(cpit);