determine current cell in the tabular controller instead of the inset

[lyx.git] / src / text.C

diff --git a/src/text.C b/src/text.C
index 6dcc706c3d6d9aa0dfa602261b9714c7ecd03951..c6dcac79284b215805bd18b5494b701cf429e3ac 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -609,9 +609,10 @@ int LyXText::leftMargin(par_type const pit, pos_type const pos) const
                   && !isFirstInSequence(pit, pars_)))
            && align == LYX_ALIGN_BLOCK
            && !par.params().noindent()
-           // in tabulars and ert paragraphs are never indented!
+           // in charstyles, tabulars and ert paragraphs are never indented!
            && (par.ownerCode() != InsetBase::TEXT_CODE
-                   && par.ownerCode() != InsetBase::ERT_CODE)
+                   && par.ownerCode() != InsetBase::ERT_CODE
+                   && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
            && (par.layout() != tclass.defaultLayout()
                || bv()->buffer()->params().paragraph_separation ==
                   BufferParams::PARSEP_INDENT))
@@ -1630,7 +1631,7 @@ void LyXText::backspace(LCursor & cur)
                    && (pars_[cpit].layout() == pars_[tmppit].layout()
                        || pars_[tmppit].layout() == tclass.defaultLayout())
                    && pars_[cpit].getAlign() == pars_[tmppit].getAlign()) {
-                       mergeParagraph(bufparams, buf.paragraphs(), cpit);
+                       mergeParagraph(bufparams, pars_, cpit);
 
                        if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1))
                                --cur.pos();