This patch revert part of the code changed in revision 18825. This is needed because...

[lyx.git] / src / Text2.cpp

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 6a296c917d7cd4c1bffa88236c8ca5481a7ebcc9..24365e99f30f99f96bb41a088e19bcadb96b5598 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -649,16 +649,12 @@ void Text::setParagraph(Cursor & cur,
                params.spacing(spacing);
 
                // does the layout allow the new alignment?
-               Layout_ptr const & layout = par.layout();
-
-               if (align == LYX_ALIGN_LAYOUT)
-                       align = layout->align;
-               if (align & layout->alignpossible) {
-                       if (align == layout->align)
-                               params.align(LYX_ALIGN_LAYOUT);
-                       else
-                               params.align(align);
-               }
+               //FIXME The reason we need the first check is because
+               //LYX_ALIGN_LAYOUT isn't required to be possible. It
+               //should be...and will be.
+               if ((align == LYX_ALIGN_LAYOUT) ||
+                   (align & par.layout()->alignpossible))
+                       params.align(align);
                par.setLabelWidthString(labelwidthstring);
                params.noindent(noindent);
        }
@@ -670,7 +666,7 @@ void Text::insertInset(Cursor & cur, Inset * inset)
 {
        BOOST_ASSERT(this == cur.text());
        BOOST_ASSERT(inset);
-       cur.paragraph().insertInset(cur.pos(), inset,
+       cur.paragraph().insertInset(cur.pos(), inset, current_font,
                                    Change(cur.buffer().params().trackChanges ?
                                           Change::INSERTED : Change::UNCHANGED));
 }