Prevent an assert when opening the citation dialog if the bibtex

[lyx.git] / src / insets / insetref.h

diff --git a/src/insets/insetref.h b/src/insets/insetref.h
index e58110c414759446e2cdf8db8992e18ddd96e168..13d32ce260598a194890baf4c7cff2e227a9f1d5 100644 (file)
--- a/src/insets/insetref.h
+++ b/src/insets/insetref.h
@@ -23,17 +23,17 @@ class InsetRef : public InsetCommand {
 public:
        struct type_info {
                ///
-               string latex_name;
+               std::string latex_name;
                ///
-               string gui_name;
+               std::string gui_name;
                ///
-               string short_gui_name;
+               std::string short_gui_name;
        };
        static type_info types[];
        ///
-       static int getType(string const & name);
+       static int getType(std::string const & name);
        ///
-       static string const & getName(int type);
+       static std::string const & getName(int type);
 
 
        InsetRef(InsetCommandParams const &, Buffer const &);
@@ -46,9 +46,7 @@ public:
                return std::auto_ptr<InsetBase>(new InsetRef(*this));
        }
        ///
-       dispatch_result localDispatch(FuncRequest const & cmd);
-       ///
-       string const getScreenLabel(Buffer const *) const;
+       std::string const getScreenLabel(Buffer const &) const;
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
        ///
@@ -56,16 +54,24 @@ public:
        ///
        bool display() const { return false; }
        ///
-       int latex(Buffer const *, std::ostream &,
-                 LatexRunParams const &) const;
+       int latex(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int linelen) const;
+       int plaintext(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &,
+                    OutputParams const &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &,
+                   OutputParams const &) const;
        ///
        void validate(LaTeXFeatures & features) const;
+protected:
+       ///
+       virtual
+       DispatchResult
+       priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &);
 private:
        ///
        bool isLatex;