small move-over charstyle -> insetlayout

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

diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp
index c81ce2759495fdfcf38862efdc71fe65ae37e267..f5e929e2817052271fdbc252d7a7e04c86f3c61c 100644 (file)
--- a/src/MenuBackend.cpp
+++ b/src/MenuBackend.cpp
@@ -627,13 +627,13 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf, std::string s)
                                    FuncRequest(LFUN_NOACTION)));
                return;
        }
-       CharStyles & charstyles =
-               buf->params().getTextClass().charstyles();
-       CharStyles::iterator cit = charstyles.begin();
-       CharStyles::iterator end = charstyles.end();
+       InsetLayouts & insetlayouts =
+               buf->params().getTextClass().insetlayouts();
+       InsetLayouts::iterator cit = insetlayouts.begin();
+       InsetLayouts::iterator end = insetlayouts.end();
        for (; cit != end; ++cit) {
-               docstring const label = from_utf8(cit->name);
-               if (cit->lyxtype == s)
+               docstring const label = cit->first;
+               if (cit->second.lyxtype == s)
                        tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, 
                                label, FuncRequest(LFUN_CHARSTYLE_INSERT,
                                                label)));

diff --git a/src/TextClass.h b/src/TextClass.h
index d2f3490c809722a9d17e32a43a922b0cabe81481..3de96d752da2b55b0a394fdba42d3ea083f58073 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -108,7 +108,9 @@ public:
        Counters & counters() const;
        /// CharStyles of this doc class
        CharStyles & charstyles() const { return charstylelist_; };
-       ///  Inset layouts of this doc class
+       /// Inset layouts of this doc class
+       InsetLayouts & insetlayouts() const { return insetlayoutlist_; };
+       ///
        InsetLayout const & insetlayout(docstring const & name) const;
        /// Retrieve element of name s:
        CharStyles::iterator charstyle(std::string const & s) const;