* InsetText:

  - wide_inset_ is not mutable any more
  - Wide(): split up in Wide() and setWide()

* rowpainter.C:
  - paintPar(): use a const_cast instead of the mutable InsetText::Wide()

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 1baf6fc9fbd19c35710754a87124aa64adf36eda..d11bc97c887063a171f229a746a4d0a9ab9eb740 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -133,7 +133,9 @@ public:
        ///
        InsetText(InsetText const &);
        ///
-       bool & Wide() const { return wide_inset_; }
+       bool Wide() const { return wide_inset_; }
+       ///
+       void setWide(bool wide_inset) { wide_inset_ = wide_inset; }
 
 protected:
        ///
@@ -156,7 +158,7 @@ private:
        ///
        static int border_;
        ///
-       mutable bool wide_inset_;
+       bool wide_inset_;
 public:
        ///
        mutable LyXText text_;

diff --git a/src/rowpainter.C b/src/rowpainter.C
index a2936fe8d96be1500a54897165c960be6663a723..6d3707c398d30b1eed3f72e81a9c2e2b6b13cc47 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -880,12 +880,17 @@ void paintPar
                        text);
 
                // If this is the only object on the row, we can make it wide
+               //
+               // FIXME: there is a const_cast here because paintPar() is not supposed
+               // to touch the paragraph contents. So either we move this "wide"
+               // property out of InsetText or we localize the feature to the painting
+               // done here.
                for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) {
                        InsetBase const * const in = par.getInset(i);
                        if (in) {
-                               InsetText const * const t = in->asTextInset();
+                               InsetText * t = const_cast<InsetText *>(in->asTextInset());
                                if (t)
-                                       t->Wide() = in_inset_alone_on_row;
+                                       t->setWide(in_inset_alone_on_row);
                        }
                }