reduce number of calls to LyXText::getFont

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 50a0a9b00f31a31a21cdb83af792796c288cad10..97fd3a7d4f0300539641adc7092907e321b9622c 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -513,9 +513,9 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
 
                if (kind == MenuItem::ImportFormats) {
                        if ((*fit)->name() == "text")
-                               label = _("ASCII text as lines");
+                               label = _("Plain Text as Lines");
                        else if ((*fit)->name() == "textparagraph")
-                               label = _("ASCII text as paragraphs");
+                               label = _("Plain Text as Paragraphs");
                        label += "...";
                }
                if (!(*fit)->shortcut().empty())
@@ -607,6 +607,15 @@ void expandToc2(Menu & tomenu,
                lyx::toc::Toc::size_type to, int depth)
 {
        int shortcut_count = 0;
+
+       // check whether depth is smaller than the smallest depth in toc.
+       int min_depth = 1000;
+       for (lyx::toc::Toc::size_type i = from; i < to; ++i)
+               min_depth = std::min(min_depth, toc_list[i].depth);
+       if (min_depth > depth)
+               depth = min_depth;
+
+
        if (to - from <= max_number_of_items) {
                for (lyx::toc::Toc::size_type i = from; i < to; ++i) {
                        string label(4 * max(0, toc_list[i].depth - depth),' ');