change "support/std_sstream.h" to <sstream>

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

diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index e7f4f30b5a3678109717707271037540d5a934c4..1485bb8f053bdaec9c12845a3b9269b8838ed633 100644 (file)
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -13,7 +13,6 @@
 #include "insetbranch.h"
 
 #include "buffer.h"
-#include "BufferView.h"
 #include "bufferparams.h"
 #include "BranchList.h"
 #include "cursor.h"
@@ -24,7 +23,7 @@
 #include "lyxlex.h"
 #include "paragraph.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::string;
 using std::auto_ptr;
@@ -94,7 +93,8 @@ void InsetBranch::setButtonLabel()
        font.decSize();
        font.decSize();
 
-       setLabel("Branch: " + params_.branch);
+       string s = "Branch: " + params_.branch;
+       setLabel(isOpen() ? s : getNewLabel(s) );
        font.setColor(LColor::foreground);
        if (!params_.branch.empty())
                setBackgroundColor(lcolor.getFromLyXName(params_.branch));
@@ -149,13 +149,19 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                        setStatus(Open);
                else if (cmd.argument == "close") {
                        setStatus(Collapsed);
-                       getOutOfInset(cur, *this);
+                       leaveInset(cur, *this);
+        } else if (cmd.argument == "toggle") {
+                       if (isOpen()) {
+                               setStatus(Collapsed);
+                               leaveInset(cur, *this);
+                       } else
+                       setStatus(Open);
 
-               // The branch inset specialises its behaviour on "toggle".
-               } else if (cmd.argument == "toggle"
+               // The branch inset uses "assign".
+               } else if (cmd.argument == "assign"
                           || cmd.argument.empty()) {
                        BranchList const & branchlist =
-                               cur.bv().buffer()->params().branchlist();
+                               cur.buffer().params().branchlist();
                        if (isBranchSelected(branchlist)) {
                                if (status() != Open)
                                        setStatus(Open);
@@ -164,7 +170,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                        } else {
                                if (status() != Collapsed) {
                                        setStatus(Collapsed);
-                                       getOutOfInset(cur, *this);
+                                       leaveInset(cur, *this);
                                } else
                                        cur.undispatched();
                        }