X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetindex.C;h=2cbee02a34398915fd25780bab46be2344be565c;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=f8f91ad4c0b4d045a5edb8e78d09246db936d140;hpb=cc719fe0ce934bdd505a52542c0e5246889e7d3f;p=lyx.git

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index f8f91ad4c0..2cbee02a34 100644
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -16,6 +16,7 @@
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "metricsinfo.h"
+#include "sgml.h"
 
 #include "support/std_ostream.h"
 
@@ -24,7 +25,7 @@ using std::ostream;
 
 
 InsetIndex::InsetIndex(InsetCommandParams const & p)
-	: InsetCommand(p)
+	: InsetCommand(p, "index")
 {}
 
 
@@ -33,53 +34,16 @@ InsetIndex::InsetIndex(InsetCommandParams const & p)
 // {}
 
 
-InsetIndex::~InsetIndex()
-{
-	InsetCommandMailer mailer("index", *this);
-	mailer.hideDialog();
-}
-
-
 string const InsetIndex::getScreenLabel(Buffer const &) const
 {
 	return _("Idx");
 }
 
 
-void InsetPrintIndex::metrics(MetricsInfo & mi, Dimension & dim) const
-{
-	InsetCommand::metrics(mi, dim);
-	center_indent_ = (mi.base.textwidth - dim.wid) / 2;
-	dim.wid = mi.base.textwidth;
-	dim_ = dim;
-}
-
-
-void InsetPrintIndex::draw(PainterInfo & pi, int x, int y) const
-{
-	InsetCommand::draw(pi, x + center_indent_, y);
-}
-
-
-DispatchResult
-InsetIndex::priv_dispatch(FuncRequest const & cmd,
-			  idx_type & idx, pos_type & pos)
-{
-	switch (cmd.action) {
-		case LFUN_INSET_EDIT:
-			InsetCommandMailer("index", *this).showDialog(cmd.view());
-			return DispatchResult(true);
-
-		default:
-			return InsetCommand::priv_dispatch(cmd, idx, pos);
-	}
-}
-
-
 int InsetIndex::docbook(Buffer const &, ostream & os,
-			LatexRunParams const &) const
+			OutputParams const &) const
 {
-	os << "<indexterm><primary>" << getContents()
+	os << "<indexterm><primary>" << sgml::escapeString(getContents())
 	   << "</primary></indexterm>";
 	return 0;
 }
@@ -93,7 +57,7 @@ InsetOld::Code InsetIndex::lyxCode() const
 
 
 InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
-	: InsetCommand(p)
+	: InsetCommand(p, string())
 {}
 
 
@@ -102,10 +66,6 @@ InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
 // {}
 
 
-InsetPrintIndex::~InsetPrintIndex()
-{}
-
-
 string const InsetPrintIndex::getScreenLabel(Buffer const &) const
 {
 	return _("Index");