fix two crashes related to dEPM. Some crashes remain

[lyx.git] / src / paragraph_pimpl.h

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index f935c93d7a74534ddadd337314c1ed5d6cc48f66..ed2e809270980647de46efe745c3d88b8b34b4e6 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -26,7 +26,8 @@
 class LyXLayout;
 
 
-struct Paragraph::Pimpl {
+class Paragraph::Pimpl {
+public:
        ///
        Pimpl(Paragraph * owner);
        /// "Copy constructor"
@@ -54,7 +55,7 @@ struct Paragraph::Pimpl {
        /// set change at pos
        void setChange(lyx::pos_type pos, Change::Type type);
        /// mark as erased
-       void markErased();
+       void markErased(bool);
        /// accept change
        void acceptChange(lyx::pos_type start, lyx::pos_type end);
        /// reject change
@@ -77,7 +78,7 @@ struct Paragraph::Pimpl {
        /// erase the given range
        int erase(lyx::pos_type start, lyx::pos_type end);
        ///
-       UpdatableInset * inset_owner;
+       InsetBase * inset_owner;
 
        /** A font entry covers a range of positions. Notice that the
            entries in the list are inserted in random order.
@@ -90,7 +91,8 @@ struct Paragraph::Pimpl {
            and font_i covers the chars in positions pos_{i-1}+1,...,pos_i
            (font_1 covers the chars 0,...,pos_1) (Dekel)
        */
-       struct FontTable  {
+       class FontTable  {
+       public:
                ///
                FontTable(lyx::pos_type p, LyXFont const & f)
                        : pos_(p), font_(f)
@@ -133,11 +135,11 @@ struct Paragraph::Pimpl {
 #endif
        };
        ///
-       friend struct matchFT;
+       friend class matchFT;
        ///
-       struct matchFT {
+       class matchFT {
+       public:
                /// used by lower_bound and upper_bound
-               inline
                int operator()(FontTable const & a, FontTable const & b) const {
                        return a.pos() < b.pos();
                }