bug + spped fixes + small stuff

[lyx.git] / src / mathed / ref_inset.C

diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C
index d157c34b75077e520aabb8caaf7497b2adf1b12d..391cffda4960177a9afffea1668c5ada10e4433d 100644 (file)
--- a/src/mathed/ref_inset.C
+++ b/src/mathed/ref_inset.C
@@ -15,6 +15,7 @@
 #include "math_factory.h"
 
 #include "BufferView.h"
+#include "cursor.h"
 #include "dispatchresult.h"
 #include "debug.h"
 #include "funcrequest.h"
@@ -25,12 +26,12 @@
 #include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 
-
 using std::string;
 using std::auto_ptr;
 using std::endl;
 
 
+
 RefInset::RefInset()
        : CommandInset("ref")
 {}
@@ -53,9 +54,7 @@ void RefInset::infoize(std::ostream & os) const
 }
 
 
-DispatchResult
-RefInset::priv_dispatch(FuncRequest const & cmd,
-                       idx_type & idx, pos_type & pos)
+DispatchResult RefInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
 {
        switch (cmd.action) {
        case LFUN_INSET_MODIFY:
@@ -63,36 +62,34 @@ RefInset::priv_dispatch(FuncRequest const & cmd,
                        MathArray ar;
                        if (!createMathInset_fromDialogStr(cmd.argument, ar))
                                return DispatchResult(false);
-
                        *this = *ar[0].nucleus()->asRefInset();
-
                        return DispatchResult(true, true);
                }
-               break;
+               return DispatchResult(false);
+
        case LFUN_MOUSE_RELEASE:
                if (cmd.button() == mouse_button::button3) {
                        lyxerr << "trying to goto ref" << cell(0) << endl;
-                       cmd.view()->dispatch(FuncRequest(LFUN_REF_GOTO, asString(cell(0))));
+                       cur.bv().dispatch(FuncRequest(LFUN_REF_GOTO, asString(cell(0))));
                        return DispatchResult(true, true);
                }
                if (cmd.button() == mouse_button::button1) {
                        // Eventually trigger dialog with button 3
                        // not 1
                        string const data = createDialogStr("ref");
-                       cmd.view()->owner()->getDialogs().
-                               show("ref", data, this);
+                       cur.bv().owner()->getDialogs().show("ref", data, this);
                        return DispatchResult(true, true);
                }
-               break;
+               return DispatchResult(false);
+
        case LFUN_MOUSE_PRESS:
        case LFUN_MOUSE_MOTION:
                // eat other mouse commands
                return DispatchResult(true, true);
+
        default:
-               return CommandInset::priv_dispatch(cmd, idx, pos);
+               return CommandInset::priv_dispatch(cur, cmd);
        }
-       // not our business
-       return DispatchResult(false);
 }
 
 
@@ -123,14 +120,14 @@ void RefInset::validate(LaTeXFeatures & features) const
 }
 
 
-int RefInset::ascii(std::ostream & os, LatexRunParams const &) const
+int RefInset::plaintext(std::ostream & os, OutputParams const &) const
 {
        os << '[' << asString(cell(0)) << ']';
        return 0;
 }
 
 
-int RefInset::linuxdoc(std::ostream & os, LatexRunParams const &) const
+int RefInset::linuxdoc(std::ostream & os, OutputParams const &) const
 {
        os << "<ref id=\"" << asString(cell(0))
           << "\" name=\"" << asString(cell(1)) << "\" >";
@@ -138,7 +135,7 @@ int RefInset::linuxdoc(std::ostream & os, LatexRunParams const &) const
 }
 
 
-int RefInset::docbook(std::ostream & os, LatexRunParams const &) const
+int RefInset::docbook(std::ostream & os, OutputParams const &) const
 {
        if (cell(1).empty()) {
                os << "<xref linkend=\"" << asString(cell(0)) << "\">";