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

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index 0997af1714..c175cf1ffd 100644
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -16,15 +16,19 @@
 #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;
 
 
 InsetIndex::InsetIndex(InsetCommandParams const & p)
-	: InsetCommand(p)
+	: InsetCommand(p, "index")
 {}
 
 
@@ -33,66 +37,31 @@ InsetIndex::InsetIndex(InsetCommandParams const & p)
 // {}
 
 
-InsetIndex::~InsetIndex()
-{
-	InsetCommandMailer mailer("index", *this);
-	mailer.hideDialog();
-}
-
-
-string const InsetIndex::getScreenLabel(Buffer const &) const
+docstring const InsetIndex::getScreenLabel(Buffer const &) const
 {
 	return _("Idx");
 }
 
 
-void InsetPrintIndex::metrics(MetricsInfo & mi, Dimension & dim) const
+int InsetIndex::docbook(Buffer const &, odocstream & os,
+			OutputParams const &) 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 DISPATCHED;
-
-		default:
-			return InsetCommand::priv_dispatch(cmd, idx, pos);
-	}
-}
-
-
-int InsetIndex::docbook(Buffer const &, ostream & os, bool) 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;
 }
 
 
 
 InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
-	: InsetCommand(p)
+	: InsetCommand(p, string())
 {}
 
 
@@ -101,11 +70,7 @@ InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
 // {}
 
 
-InsetPrintIndex::~InsetPrintIndex()
-{}
-
-
-string const InsetPrintIndex::getScreenLabel(Buffer const &) const
+docstring const InsetPrintIndex::getScreenLabel(Buffer const &) const
 {
 	return _("Index");
 }
@@ -117,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