Change to use preffered calling of Boost.Function

[lyx.git] / src / paragraph_pimpl.h

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index a9b1e07d52f0873c6ebcdad898bf3de4b29b525f..f935c93d7a74534ddadd337314c1ed5d6cc48f66 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -25,6 +25,7 @@
 
 class LyXLayout;
 
+
 struct Paragraph::Pimpl {
        ///
        Pimpl(Paragraph * owner);
@@ -66,11 +67,9 @@ struct Paragraph::Pimpl {
        ///
        void setChar(lyx::pos_type pos, value_type c);
        ///
-       void insertChar(lyx::pos_type pos, value_type c,
-               LyXFont const & font, Change change = Change(Change::INSERTED));
+       void insertChar(lyx::pos_type pos, value_type c, Change change);
        ///
-       void insertInset(lyx::pos_type pos, InsetBase * inset,
-               LyXFont const & font, Change change = Change(Change::INSERTED));
+       void insertInset(lyx::pos_type pos, InsetBase * inset, Change change);
        /// definite erase
        void eraseIntern(lyx::pos_type pos);
        /// erase the given position. Returns true if it was actually erased
@@ -94,18 +93,25 @@ struct Paragraph::Pimpl {
        struct FontTable  {
                ///
                FontTable(lyx::pos_type p, LyXFont const & f)
-                       : pos_(p)
+                       : pos_(p), font_(f)
                {
+#if 0
                        font_ = container.get(f);
+#endif
                }
                ///
                lyx::pos_type pos() const { return pos_; }
                ///
                void pos(lyx::pos_type p) { pos_ = p; }
                ///
-               LyXFont const & font() const { return *font_; }
+               LyXFont const & font() const { return font_; }
+#if 0
                ///
                void font(LyXFont const & f) { font_ = container.get(f);}
+#else
+               ///
+               void font(LyXFont const & f) { font_ = f;}
+#endif
        private:
                /// End position of paragraph this font attribute covers
                lyx::pos_type pos_;
@@ -118,9 +124,13 @@ struct Paragraph::Pimpl {
                    The values LyXFont::IGNORE_* and LyXFont::TOGGLE are NOT
                    allowed in these font tables.
                */
+#if 0
                boost::shared_ptr<LyXFont> font_;
                ///
                static ShareContainer<LyXFont> container;
+#else
+               LyXFont font_;
+#endif
        };
        ///
        friend struct matchFT;