anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-08 10:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 1764 (parindent use)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9893 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2005-05-01 16:22:48 +00:00
parent 6d5b9d7791
commit ccec9da254
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-05-01 Martin Vermeer <martin.vermeer@hut.fi>
* text.C (leftMargin): Fix the parindent use bug (1764)
by dirty trick
2005-04-28 Michael Schmitt <michael.schmitt@teststep.org> 2005-04-28 Michael Schmitt <michael.schmitt@teststep.org>
* lyxlayout.C (Read): transform underscores to spaces in CopyStyle * lyxlayout.C (Read): transform underscores to spaces in CopyStyle

2
src/text.C
View File

@ -591,7 +591,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
&& align == LYX_ALIGN_BLOCK && align == LYX_ALIGN_BLOCK
&& !par.params().noindent() && !par.params().noindent()
// in charstyles, tabulars and ert paragraphs are never indented! // 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::ERT_CODE
&& par.ownerCode() != InsetBase::CHARSTYLE_CODE) && par.ownerCode() != InsetBase::CHARSTYLE_CODE)
&& (par.layout() != tclass.defaultLayout() && (par.layout() != tclass.defaultLayout()