prepare for 1.1.6pre2

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

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index 01008adad2e5ce81591a80e8ac3c4e7dd0d3e95e..b936e53ad941b1301fba6f4c22964f94cabc9d8f 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -16,20 +16,17 @@
 
 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());
-       else if( button == 1 )
+       else if (button == 1 )
                bv->owner()->getDialogs()->showRef( this );
 }
 
@@ -50,7 +47,7 @@ string const InsetRef::getScreenLabel() const
 
        temp += getContents();
 
-       if(!current_view->buffer()->isLatex()
+       if (!isLatex
           && !getOptions().empty()) {
                temp += "||";
                temp += getOptions();
@@ -62,7 +59,7 @@ string const 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, int linelen) const
+int InsetRef::Ascii(Buffer const *, ostream & os, int) const
 {
        os << "[" << getContents() << "]";
        return 0;
@@ -120,6 +117,6 @@ 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;
 }