Fixed cut&paste bugs and added freespacing for ERT Insets.

[lyx.git] / src / text.C

diff --git a/src/text.C b/src/text.C
index 8223f710b12e8be61305f520e72cccfd7ecbe04e..8e5d3ea8d41b499d9aa5ee4cda39c7b44b7810fd 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1746,7 +1746,8 @@ void LyXText::insertChar(BufferView * bview, char c)
 
        bool const freeSpacing = 
                textclasslist.Style(bview->buffer()->params.textclass,
-                              cursor.row()->par()->getLayout()).free_spacing;
+                              cursor.row()->par()->getLayout()).free_spacing ||
+               cursor.row()->par()->isFreeSpacing();
 
 
        if (lyxrc.auto_number) {
@@ -3186,9 +3187,9 @@ void LyXText::paintFirstRow(DrawRowParams & p)
                
                y_top += 3 * defaultHeight();
        } else if (parparams.spaceTop().kind() == VSpace::LENGTH) {
-               string str(string(_("Space above")) + " ("
+               string str = string(_("Space above")) + " ("
                        + parparams.spaceTop().asLyXCommand()
-                       + ")");
+                       + ")";
  
                int const space = int(parparams.spaceTop().inPixels(p.bv));
                int const y = p.yo + y_top + space / 2;
@@ -3402,9 +3403,10 @@ void LyXText::paintLastRow(DrawRowParams & p)
  
                y_bottom -= 3 * defaultHeight();
        } else if (parparams.spaceBottom().kind() == VSpace::LENGTH) {
-               string str(string(_("Space below")) + " ("
+               string str = string(_("Space below"))
+                       + " ("
                        + parparams.spaceBottom().asLyXCommand()
-                       + ")");
+                       + ")";
  
                int const space = int(parparams.spaceBottom().inPixels(p.bv));
                int const y = p.yo + y_bottom - space / 2;