prepare for 1.1.6pre2

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

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index 0f50539eff3171e227fe67e0226fe4dddb6c1803..b936e53ad941b1301fba6f4c22964f94cabc9d8f 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -16,25 +16,22 @@
 
 using std::ostream;
 
-extern BufferView * current_view;
-
-
-InsetRef::InsetRef(InsetCommandParams const & p)
-       : InsetCommand(p)
+InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
+       : InsetCommand(p), isLatex(buf.isLatex())
 {}
 
 void InsetRef::Edit(BufferView * bv, int, int, unsigned int button)
 {
        // Eventually trigger dialog with button 3 not 1
-       if( button == 3 )
+       if (button == 3 )
                bv->owner()->getLyXFunc()->
-                       Dispatch(LFUN_REF_GOTO, getContents().c_str());
-       else if( button == 1 )
+                       Dispatch(LFUN_REF_GOTO, getContents());
+       else if (button == 1 )
                bv->owner()->getDialogs()->showRef( this );
 }
 
 
-string InsetRef::getScreenLabel() const
+string const InsetRef::getScreenLabel() const
 {
        string temp;
        if (getCmdName() == "ref")
@@ -50,7 +47,7 @@ string InsetRef::getScreenLabel() const
 
        temp += getContents();
 
-       if(!current_view->buffer()->isLatex()
+       if (!isLatex
           && !getOptions().empty()) {
                temp += "||";
                temp += getOptions();
@@ -62,7 +59,7 @@ string InsetRef::getScreenLabel() const
 int InsetRef::Latex(Buffer const *, ostream & os,
                    bool /*fragile*/, bool /*fs*/) const
 {
-       if(getOptions().empty())
+       if (getOptions().empty())
                os << escape(getCommand());
        else {
                InsetCommandParams p( getCmdName(), getContents(), "" );
@@ -72,7 +69,7 @@ int InsetRef::Latex(Buffer const *, ostream & os,
 }
 
 
-int InsetRef::Ascii(Buffer const *, ostream & os) const
+int InsetRef::Ascii(Buffer const *, ostream & os, int) const
 {
        os << "[" << getContents() << "]";
        return 0;
@@ -97,7 +94,7 @@ int InsetRef::DocBook(Buffer const *, ostream & os) const
 
 // This function escapes 8-bit characters and other problematic characters
 // It's exactly the same code as in insetlabel.C.
-string InsetRef::escape(string const & lab) const
+string const InsetRef::escape(string const & lab) const
 {
        char hexdigit[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
                              '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
@@ -115,10 +112,11 @@ string InsetRef::escape(string const & lab) const
        return enc;
 }
 
+
 void InsetRef::Validate(LaTeXFeatures & features) const
 {
        if (getCmdName() == "vref" || getCmdName() == "vpageref")
                features.varioref = true;
-       else if(getCmdName() == "prettyref")
+       else if (getCmdName() == "prettyref")
                features.prettyref = true;
 }