More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index bb4373347ac4c2127eb3fb1904ecf694f06fe3af..e0d4cb9ec28f0ae613c566f60ca9982a8a4c71cd 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -407,15 +407,17 @@ void LyXParagraph::validate(LaTeXFeatures & features) const
 
 
 // First few functions needed for cut and paste and paragraph breaking.
-void LyXParagraph::CopyIntoMinibuffer(BufferParams const & bparams,
+void LyXParagraph::CopyIntoMinibuffer(Buffer const & buffer,
                                      LyXParagraph::size_type pos) const
 {
+       BufferParams bparams = buffer.params;
+
        minibuffer_char = GetChar(pos);
        minibuffer_font = GetFontSettings(bparams, pos);
        minibuffer_inset = 0;
        if (minibuffer_char == LyXParagraph::META_INSET) {
                if (GetInset(pos)) {
-                       minibuffer_inset = GetInset(pos)->Clone(*current_view->buffer());
+                       minibuffer_inset = GetInset(pos)->Clone(buffer);
                } else {
                        minibuffer_inset = 0;
                        minibuffer_char = ' ';
@@ -838,8 +840,7 @@ LyXFont const LyXParagraph::GetFontSettings(BufferParams const & bparams,
                                "position does not exist. "
                               << pos << " (" << static_cast<int>(pos)
                               << ")" << endl;
-       }
-       else if (pos > 0) {
+       } else if (pos > 0) {
                return GetFontSettings(bparams, pos - 1);
        }
 #else
@@ -853,6 +854,7 @@ LyXFont const LyXParagraph::GetFontSettings(BufferParams const & bparams,
        //return LyXFont(LyXFont::ALL_INHERIT);
 }
 
+
 // Gets uninstantiated font setting at position 0
 LyXFont const LyXParagraph::GetFirstFontSettings() const
 {