From fc1dc6082e2ab74efaabde1822b202804ec3aa89 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 15 Mar 2008 03:19:45 +0000 Subject: [PATCH] Still trying to fix bug 2178. Will this do it? I do hope so. (Problem reported by Dov.) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23756 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Paragraph.cpp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index d4f5d0dc1a..5832b64684 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -1616,6 +1616,19 @@ void Paragraph::setBeginOfBody() } +bool Paragraph::forceEmptyLayout() const +{ + Inset const * const inset = inInset(); + return inset && inInset()->forceEmptyLayout(); +} + + +bool Paragraph::allowParagraphCustomization() const +{ + return inInset() && inInset()->allowParagraphCustomization(0); +} + + namespace { // This is a hack based upon one in InsetText::neverIndent(). // When we have a real InsetTableCell, then we won't need this @@ -1631,23 +1644,9 @@ namespace { } -bool Paragraph::forceEmptyLayout() const -{ - Inset * inset = inInset(); - return inset && - (inTableCell(inset) || inInset()->forceEmptyLayout()); -} - - -bool Paragraph::allowParagraphCustomization() const -{ - return inInset() && inInset()->allowParagraphCustomization(0); -} - - bool Paragraph::useEmptyLayout() const { - Inset * inset = inInset(); + Inset const * const inset = inInset(); return inset && (inTableCell(inset) || inInset()->useEmptyLayout()); } -- 2.39.5