X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.cpp;h=d41806d6dfba82419bc0e1dd259f6ce9ba47033e;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=68d922e76e782a473807183d293c095fc78dec66;hpb=c7afa2d6581e350834f39c01ba3ba173a8c2022e;p=lyx.git

diff --git a/src/sgml.cpp b/src/sgml.cpp
index 68d922e76e..d41806d6df 100644
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -28,7 +28,6 @@
 #include "support/textutils.h"
 
 #include <map>
-#include <ostream>
 
 using namespace std;
 using namespace lyx::support;
@@ -121,7 +120,7 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
 	// and adds a number for uniqueness.
 	// If you know what you are doing, you can set allowed==""
 	// to disable this mangling.
-	TextClass const & tclass = buf.params().textClass();
+	DocumentClass const & tclass = buf.params().documentClass();
 	docstring const allowed = from_ascii(
 		runparams.flavor == OutputParams::XML ? ".-_:" : tclass.options());
 
@@ -201,10 +200,10 @@ void sgml::closeTag(odocstream & os, string const & name)
 void sgml::openTag(Buffer const & buf, odocstream & os,
 	OutputParams const & runparams, Paragraph const & par)
 {
-	LayoutPtr const & style = par.layout();
-	string const & name = style->latexname();
-	string param = style->latexparam();
-	Counters & counters = buf.params().textClass().counters();
+	Layout const & style = par.layout();
+	string const & name = style.latexname();
+	string param = style.latexparam();
+	Counters & counters = buf.params().documentClass().counters();
 
 	string id = par.getID(buf, runparams);
 
@@ -220,8 +219,8 @@ void sgml::openTag(Buffer const & buf, odocstream & os,
 	} else {
 		if (param.find('#') != string::npos) {
 			// FIXME UNICODE
-			if (!style->counter.empty())
-				counters.step(style->counter);
+			if (!style.counter.empty())
+				counters.step(style.counter);
 			else
 				counters.step(from_ascii(name));
 			int i = counters.value(from_ascii(name));
@@ -236,8 +235,8 @@ void sgml::openTag(Buffer const & buf, odocstream & os,
 
 void sgml::closeTag(odocstream & os, Paragraph const & par)
 {
-	LayoutPtr const & style = par.layout();
-	closeTag(os, style->latexname());
+	Layout const & style = par.layout();
+	closeTag(os, style.latexname());
 }