From a2ffb1915a66e5eabc43f088e08e654066c077b0 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 29 Sep 2008 10:56:45 +0000 Subject: [PATCH] remove mutable property git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26621 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiParagraph.cpp | 12 +++--------- src/frontends/qt4/GuiParagraph.h | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp index 42255010d9..9fa34c6c2f 100644 --- 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 2091e079f8..25c08240a3 100644 --- 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 -- 2.39.2