X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=e26f70f4bce4ca04754af67565dd6263acd09e30;hb=3f7d2a66f522a45583e0a8b0ba734bb71f0ddde0;hp=4a0a9a7a85c0c2b3b6b0e96d76191fbed2f73167;hpb=5166d49d2db3860b49b4569041035a6ffab1ad76;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 4a0a9a7a85..e26f70f4bc 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -19,7 +19,7 @@
 
 #include "Paragraph.h"
 
-#include "BaseClassList.h"
+#include "LayoutFile.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Changes.h"
@@ -159,7 +159,7 @@ public:
 
 	///
 	void validate(LaTeXFeatures & features,
-		      Layout const * layout) const;
+		      Layout const & layout) const;
 
 	/// Checks if the paragraph contains only text and no inset or font change.
 	bool onlyText(Buffer const & buf, Font const & outerfont,
@@ -987,14 +987,14 @@ bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
 
 
 void Paragraph::Private::validate(LaTeXFeatures & features,
-				Layout const * layout) const
+				Layout const & layout) const
 {
 	// check the params.
 	if (!params_.spacing().isDefault())
 		features.require("setspace");
 
 	// then the layouts
-	features.useLayout(layout->name());
+	features.useLayout(layout.name());
 
 	// then the fonts
 	fontlist_.validate(features);
@@ -1009,7 +1009,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features,
 	for (; icit != iend; ++icit) {
 		if (icit->inset) {
 			icit->inset->validate(features);
-			if (layout->needprotect &&
+			if (layout.needprotect &&
 			    icit->inset->lyxCode() == FOOT_CODE)
 				features.require("NeedLyXFootnoteCode");
 		}
@@ -1175,7 +1175,7 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
 
 void Paragraph::validate(LaTeXFeatures & features) const
 {
-	d->validate(features, d->layout_);
+	d->validate(features, *d->layout_);
 }