From 776a4f53c2bea41ee0799edf9d2a15ac4559cf3a Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Sat, 28 Feb 2015 23:41:20 +0100 Subject: [PATCH] Revert some other dubious "improvements" in b627b870 --- src/Text.cpp | 8 ++++---- src/Text2.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Text.cpp b/src/Text.cpp index 526a1b5323..c20c53d338 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -113,8 +113,8 @@ static bool moveItem(Paragraph & fromPar, pos_type fromPos, // Therefore, it should only be used for breaking and merging paragraphs // We need a copy here because the character at fromPos is going to be erased. - Font const & tmpFont = fromPar.getFontSettings(params, fromPos); - Change const & tmpChange = fromPar.lookupChange(fromPos); + Font const tmpFont = fromPar.getFontSettings(params, fromPos); + Change const tmpChange = fromPar.lookupChange(fromPos); if (Inset * tmpInset = fromPar.getInset(fromPos)) { fromPar.releaseInset(fromPos); @@ -2097,11 +2097,11 @@ void Text::charsTranspose(Cursor & cur) // Store the characters to be transposed (including font information). char_type const char1 = par.getChar(pos1); - Font const & font1 = + Font const font1 = par.getFontSettings(cur.buffer()->params(), pos1); char_type const char2 = par.getChar(pos2); - Font const & font2 = + Font const font2 = par.getFontSettings(cur.buffer()->params(), pos2); // And finally, we are ready to perform the transposition. diff --git a/src/Text2.cpp b/src/Text2.cpp index 2597e35edf..4f6a975957 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -408,7 +408,7 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall) // Try implicit word selection // If there is a change in the language the implicit word selection // is disabled. - CursorSlice const & resetCursor = cur.top(); + CursorSlice const resetCursor = cur.top(); bool const implicitSelection = font.language() == ignore_language && font.fontInfo().number() == FONT_IGNORE -- 2.39.2