From ccec9da254a15836b689d12ba07eea0c57e5c00f Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Sun, 1 May 2005 16:22:48 +0000 Subject: [PATCH] Fix bug 1764 (parindent use) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9893 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 9 +++++++-- src/text.C | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fd48d4c9bc..8a37fe4e32 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,12 @@ +2005-05-01 Martin Vermeer + + * text.C (leftMargin): Fix the parindent use bug (1764) + by dirty trick + 2005-04-28 Michael Schmitt - * lyxlayout.C (Read): transform underscores to spaces in CopyStyle - argument. + * lyxlayout.C (Read): transform underscores to spaces in CopyStyle + argument. 2005-04-25 Angus Leeming diff --git a/src/text.C b/src/text.C index 1753cea13f..12974e8e57 100644 --- a/src/text.C +++ b/src/text.C @@ -591,7 +591,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const && align == LYX_ALIGN_BLOCK && !par.params().noindent() // in charstyles, tabulars and ert paragraphs are never indented! - && (par.ownerCode() != InsetBase::TEXT_CODE + && ((par.ownerCode() != InsetBase::TEXT_CODE || isMainText()) && par.ownerCode() != InsetBase::ERT_CODE && par.ownerCode() != InsetBase::CHARSTYLE_CODE) && (par.layout() != tclass.defaultLayout()