* temporary fix for the crash of the pixmap cache on Mac with Qt 4.4.

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 42b95330bff8075f4f664a66b9a59efd13c4dbf1..e59e4a5909ef05df2e6b0d6a512ed0a920a37c61 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -36,22 +36,22 @@ 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);
-       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);
+       Font const & tmpFont = fromPar.getFontSettings(params, fromPos);
+       Change const & tmpChange = fromPar.lookupChange(fromPos);
+
+       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;
                }
-               return 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;
 }
 
@@ -123,7 +123,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);
                }