Some minor upgrades to r25555. Moved addLayoutIfNeeded() to DocumentClass, most impor...

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

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index ae37ebef15c1c73e1effa1b44d5bfe4e923888eb..88b23487b7bc9a7dc84e79eb69beed2d862e9cde 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -903,13 +903,6 @@ bool TextClass::hasLayout(docstring const & n) const
 }
 
 
-void TextClass::addLayoutIfNeeded(docstring const & n) const
-{
-       if (!hasLayout(n))
-               layoutlist_.push_back(createEmptyLayout(n, true));
-}
-
-
 Layout const & TextClass::operator[](docstring const & name) const
 {
        LASSERT(!name.empty(), /**/);
@@ -995,6 +988,13 @@ bool TextClass::load(string const & path) const
 }
 
 
+void DocumentClass::addLayoutIfNeeded(docstring const & n) const
+{
+       if (!hasLayout(n))
+               layoutlist_.push_back(createEmptyLayout(n, true));
+}
+
+
 InsetLayout const & DocumentClass::insetLayout(docstring const & name) const 
 {
        docstring n = name;

diff --git a/src/TextClass.h b/src/TextClass.h
index 2d640031f0d1178b350d0fce69fa60dca2ae53f1..254ee586fedcf64e9fded392de295a673e61eafd 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -96,11 +96,6 @@ public:
        // NOTE: Layout pointers are directly assigned to paragraphs so a
        // container that does not invalidate these pointers after insertion
        // is needed.
-       //
-       // NOTE: It makes sense to add unknown layouts to DocumentClass
-       // and make them buffer-dependent. However, this requires
-       // reimplementation of a lot of functions such as hasLayout
-       // and operator[], with little benefit.
        typedef std::list<Layout> LayoutList;
        /// The inset layouts available to this class
        typedef std::map<docstring, InsetLayout> InsetLayouts;
@@ -127,11 +122,6 @@ public:
        bool isDefaultLayout(Layout const &) const;
        /// 
        bool isPlainLayout(Layout const &) const;
-       /// Create a default layout for this textclass.
-       /** \param unknown Set to true if this layout is a default layout used to
-        * represent an unknown layout
-        */
-       Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
        /// returns a special layout for use when we don't really want one,
        /// e.g., in table cells
        Layout const & emptyLayout() const 
@@ -143,8 +133,6 @@ public:
        size_t layoutCount() const { return layoutlist_.size(); }
        ///
        bool hasLayout(docstring const & name) const;
-       /// add a default layout \c name if it does not exist in layoutlist_
-       void addLayoutIfNeeded(docstring const & name) const;
        ///
        Layout const & operator[](docstring const & vname) const;
 
@@ -201,7 +189,12 @@ protected:
        TextClass();
        ///
        Layout & operator[](docstring const & vname);
-
+       /// Create an empty layout for this textclass.
+       /** \param unknown Set to true if this layout is a default layout used to
+        * represent an unknown layout
+        */
+       Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
+       
        ///////////////////////////////////////////////////////////////////
        // non-const iterators
        ///////////////////////////////////////////////////////////////////
@@ -347,6 +340,8 @@ public:
        InsetLayout const & insetLayout(docstring const & name) const;
        /// an empty inset layout for use as a default
        static InsetLayout const & emptyInsetLayout() { return empty_insetlayout_; }
+       /// add an empty layout \c name if it does not exist in layoutlist_
+       void addLayoutIfNeeded(docstring const & name) const;
 
        ///////////////////////////////////////////////////////////////////
        // accessors