Patch from Peter.

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index dc32425ea238d999f6a3f98489238eacf79de2cc..2881c49325adfc0dde489fdd4a0dcba16068ea0c 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -36,29 +36,23 @@ static bool moveItem(Paragraph & fromPar, pos_type fromPos,
        // Note: moveItem() does not honour change tracking!
        // Therefore, it should only be used for breaking and merging paragraphs
 
-       char_type const tmpChar = fromPar.getChar(fromPos);
+       // 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);
 
-       if (fromPar.isInset(fromPos)) {
-               Inset * tmpInset = 0;
-               if (fromPar.getInset(fromPos)) {
-                       // the inset is not in the paragraph any more
-                       tmpInset = fromPar.releaseInset(fromPos);
-               }
-
-               Inset * inset = toPar.inInset();
-               if (inset && !inset->insetAllowed(tmpInset->lyxCode())) {
+       if (Inset * tmpInset = fromPar.getInset(fromPos)) {
+               fromPar.releaseInset(fromPos);
+               // The inset is not in fromPar any more.
+               if (!toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange)) {
                        delete tmpInset;
                        return false;
                }
-
-               toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange);
-       } else {
-               fromPar.eraseChar(fromPos, false);
-               toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
+               return true;
        }
 
+       char_type const tmpChar = fromPar.getChar(fromPos);
+       fromPar.eraseChar(fromPos, false);
+       toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
        return true;
 }
 
@@ -75,7 +69,7 @@ void breakParagraph(BufferParams const & bparams,
        Paragraph & par = pars[par_offset];
 
        // remember to set the inset_owner
-       tmp->setInsetOwner(par.inInset());
+       tmp->setInsetOwner(&par.inInset());
        // without doing that we get a crash when typing <Return> at the
        // end of a paragraph
        tmp->setPlainOrDefaultLayout(bparams.documentClass());
@@ -130,7 +124,7 @@ void breakParagraph(BufferParams const & bparams,
                // breaking paragraph.
                if (tmp->empty()) {
                        Font changed = tmp->getFirstFontSettings(bparams);
-                       Font old = par.getFontSettings(bparams, par.size());
+                       Font const & old = par.getFontSettings(bparams, par.size());
                        changed.setLanguage(old.language());
                        tmp->setFont(0, changed);
                }
@@ -163,8 +157,8 @@ void breakParagraphConservative(BufferParams const & bparams,
                                       Paragraph());
        Paragraph & par = pars[par_offset];
 
+       tmp.setInsetOwner(&par.inInset());
        tmp.makeSameLayout(par);
-       tmp.setInsetOwner(par.inInset());
 
        LASSERT(pos <= par.size(), /**/);