X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetindex.C;h=c175cf1ffd14cb5e05d7aafff22049ef7542ac57;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=fa27b2440b5076d7bf40a13efa82e3e22aaf35c7;hpb=fd355bbb2f3b192ccf92a59177eb68255449048f;p=lyx.git

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index fa27b2440b..c175cf1ffd 100644
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -16,9 +16,13 @@
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "metricsinfo.h"
+#include "sgml.h"
 
 #include "support/std_ostream.h"
 
+
+namespace lyx {
+
 using std::string;
 using std::ostream;
 
@@ -33,24 +37,25 @@ InsetIndex::InsetIndex(InsetCommandParams const & p)
 // {}
 
 
-string const InsetIndex::getScreenLabel(Buffer const &) const
+docstring const InsetIndex::getScreenLabel(Buffer const &) const
 {
 	return _("Idx");
 }
 
 
-int InsetIndex::docbook(Buffer const &, ostream & os,
+int InsetIndex::docbook(Buffer const &, odocstream & os,
 			OutputParams const &) const
 {
-	os << "<indexterm><primary>" << getContents()
+	os << "<indexterm><primary>"
+           << sgml::escapeString(getParam("name"))
 	   << "</primary></indexterm>";
 	return 0;
 }
 
 
-InsetOld::Code InsetIndex::lyxCode() const
+InsetBase::Code InsetIndex::lyxCode() const
 {
-	return InsetOld::INDEX_CODE;
+	return InsetBase::INDEX_CODE;
 }
 
 
@@ -65,7 +70,7 @@ InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
 // {}
 
 
-string const InsetPrintIndex::getScreenLabel(Buffer const &) const
+docstring const InsetPrintIndex::getScreenLabel(Buffer const &) const
 {
 	return _("Index");
 }
@@ -77,7 +82,10 @@ void InsetPrintIndex::validate(LaTeXFeatures & features) const
 }
 
 
-InsetOld::Code InsetPrintIndex::lyxCode() const
+InsetBase::Code InsetPrintIndex::lyxCode() const
 {
-	return InsetOld::INDEX_PRINT_CODE;
+	return InsetBase::INDEX_PRINT_CODE;
 }
+
+
+} // namespace lyx