remove mutable property

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

diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp
index 42255010d99df10bed1cd9186f13beb78eafaac8..9fa34c6c2f45617c9ecd6acb331a2309babe97ea 100644 (file)
--- a/src/frontends/qt4/GuiParagraph.cpp
+++ b/src/frontends/qt4/GuiParagraph.cpp
@@ -196,13 +196,7 @@ void GuiParagraph::on_restorePB_clicked()
 
 void GuiParagraph::applyView()
 {
-       if (haveMultiParSelection()) {
-               // FIXME: in case of multi-paragraph selection, it would be nice to
-               // initialise the parameters that are common to all paragraphs.
-               params_ = ParagraphParameters();
-       } else {
-               params_ = bufferview()->cursor().innerParagraph().params();
-       }
+       params_ = params();
 
        params_.align(getAlignmentFromDialog());
 
@@ -318,8 +312,8 @@ ParagraphParameters const & GuiParagraph::params() const
        if (haveMultiParSelection()) {
                // FIXME: in case of multi-paragraph selection, it would be nice to
                // initialise the parameters that are common to all paragraphs.
-               params_ = ParagraphParameters();
-               return params_;
+               static ParagraphParameters empty;
+               return empty;
        }
        return bufferview()->cursor().innerParagraph().params();
 }

diff --git a/src/frontends/qt4/GuiParagraph.h b/src/frontends/qt4/GuiParagraph.h
index 2091e079f8859457fbc7a26f8e5c5b0d6211b04f..25c08240a3e4539353dcb3b637374455a79d457c 100644 (file)
--- a/src/frontends/qt4/GuiParagraph.h
+++ b/src/frontends/qt4/GuiParagraph.h
@@ -94,7 +94,7 @@ private:
        ///
        QString alignDefaultLabel_;
        ///
-       mutable ParagraphParameters params_;
+       ParagraphParameters params_;
 };
 
 } // namespace frontend