insetbranch.C (linuxdoc, docbook): minor fix.

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

diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index c01cccddb8139f7054c2ecaf88b8f22c5a8ac63e..0193d450ef60e82e815903e61ed75915f2499900 100644 (file)
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -17,6 +17,7 @@
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "gettext.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "paragraph.h"
 
@@ -31,6 +32,7 @@ using std::ostringstream;
 void InsetBranch::init()
 {
        setInsetName("Branch");
+       setButtonLabel();
 }
 
 
@@ -97,10 +99,9 @@ void InsetBranch::setButtonLabel()
 
        setLabel("Branch: " + params_.branch);
        font.setColor(LColor::foreground);
-       string const color = params_.branchlist.getColor(params_.branch);
-       if (!color.empty()) {
+       if (!params_.branch.empty())
                setBackgroundColor(lcolor.getFromLyXName(params_.branch));
-       } else
+       else
                setBackgroundColor(LColor::background);
        setLabelFont(font);
 }
@@ -156,15 +157,17 @@ int InsetBranch::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetBranch::linuxdoc(Buffer const &, std::ostream &) const
+int InsetBranch::linuxdoc(Buffer const & buf, std::ostream & os) const
 {
-       return 0;
+       string const branch_sel = buf.params().branchlist().allSelected();
+       if (branch_sel.find(params_.branch, 0) != string::npos)
+               return inset.linuxdoc(buf, os);
+       return 0;
 }
 
 
 int InsetBranch::docbook(Buffer const & buf, std::ostream & os, bool mixcont) const
 {
-       // untested - MV
        string const branch_sel = buf.params().branchlist().allSelected();
        if (branch_sel.find(params_.branch, 0) != string::npos)
                return inset.docbook(buf, os, mixcont);
@@ -213,7 +216,7 @@ string const InsetBranchMailer::params2string(string const & name,
        params.write(data);
        // Add all_branches parameter to data:
        data << params.branchlist.allBranches() << "\n";
-       return STRCONV(data.str());
+       return data.str();
 }
 
 
@@ -225,7 +228,7 @@ void InsetBranchMailer::string2params(string const & in,
        if (in.empty())
                return;
 
-       istringstream data(STRCONV(in));
+       istringstream data(in);
        LyXLex lex(0,0);
        lex.setStream(data);
        params.read(lex);