X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetert.C;h=9daea852d7b7aee8c56c8d537e6cb369fef6ae35;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=e964ea2b9da4f943e8f0ade0c241f8a2e8f7f6c1;hpb=9d2abd45056c0e99cdb3267d2e666a36b7032406;p=lyx.git

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index e964ea2b9d..9daea852d7 100644
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -18,17 +18,25 @@
 #include "lyxfont.h"
 #include "language.h"
 #include "buffer.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
 #include "lyx_gui_misc.h"
 #include "BufferView.h"
 #include "LyXView.h"
 #include "lyxtext.h"
+#include "debug.h"
+#include "lyxtextclasslist.h"
+
+#include "insets/insettext.h"
+
 #include "frontends/Dialogs.h"
 #include "frontends/Alert.h"
-#include "debug.h"
+
+#include "support/LOstream.h"
+
 
 using std::ostream;
+using std::min;
+using std::endl;
+
 using lyx::pos_type;
 
 
@@ -121,11 +129,12 @@ void InsetERT::read(Buffer const * buf, LyXLex & lex)
 			token_found = true;
 		} else {
 			lyxerr << "InsetERT::Read: Missing 'status'-tag!"
-				   << std::endl;
+				   << endl;
 			// take countermeasures
 			lex.pushToken(token);
 		}
 	}
+#if 0
 #warning this should be really short lived only for compatibility to
 #warning files written 07/08/2001 so this has to go before 1.2.0! (Jug)
 	if (lex.isOK()) {
@@ -139,6 +148,7 @@ void InsetERT::read(Buffer const * buf, LyXLex & lex)
 			lex.pushToken(token);
 		}
 	}
+#endif
 	inset.read(buf, lex);
 
 #ifndef INHERIT_LANG
@@ -173,7 +183,7 @@ void InsetERT::write(Buffer const * buf, ostream & os) const
 {
 	string st;
 
-	switch(status_) {
+	switch (status_) {
 	case Open: 
 		st = "Open";
 		break;
@@ -201,7 +211,7 @@ void InsetERT::write(Buffer const * buf, ostream & os) const
 			case Paragraph::META_INSET:
 			case Paragraph::META_HFILL:
 				lyxerr << "Element is not allowed in insertERT"
-				       << std::endl;
+				       << endl;
 			case Paragraph::META_NEWLINE:
 				os << "\n\\newline \n";
 				break;
@@ -265,8 +275,8 @@ void InsetERT::edit(BufferView * bv, int x, int y, unsigned int button)
 	} else {
 		InsetCollapsable::edit(bv, x, y, button);
 	}
-	updateStatus(0);
 	set_latex_font(bv);
+	updateStatus(bv);
 }
 
 
@@ -299,11 +309,11 @@ void InsetERT::insetButtonPress(BufferView * bv,
 }
 
 
-void InsetERT::insetButtonRelease(BufferView * bv, int x, int y, int button)
+bool InsetERT::insetButtonRelease(BufferView * bv, int x, int y, int button)
 {
 	if (button == 3) {
 		showInsetDialog(bv);
-		return;
+		return true;
 	}
  
 	if (status_ != Inlined && (x >= 0)  && (x < button_length) &&
@@ -322,6 +332,7 @@ void InsetERT::insetButtonRelease(BufferView * bv, int x, int y, int button)
 			inset.insetButtonRelease(bv, x, yy, button);
 		}
 	}
+	return false;
 }
 
 
@@ -336,7 +347,7 @@ void InsetERT::insetMotionNotify(BufferView * bv,
 }
 
 
-int InsetERT::latex(Buffer const *, std::ostream & os, bool /*fragile*/,
+int InsetERT::latex(Buffer const *, ostream & os, bool /*fragile*/,
 		    bool /*free_spc*/) const
 {
 	Paragraph * par = inset.paragraph();
@@ -367,13 +378,13 @@ int InsetERT::latex(Buffer const *, std::ostream & os, bool /*fragile*/,
 
 
 int InsetERT::ascii(Buffer const *,
-		    std::ostream &, int /*linelen*/) const 
+		    ostream &, int /*linelen*/) const 
 {
 	return 0;
 }
 
 
-int InsetERT::linuxdoc(Buffer const *, std::ostream & os) const
+int InsetERT::linuxdoc(Buffer const *, ostream & os) const
 {
 	Paragraph * par = inset.paragraph();
 	int lines = 0;
@@ -402,7 +413,7 @@ int InsetERT::linuxdoc(Buffer const *, std::ostream & os) const
 }
 
 
-int InsetERT::docbook(Buffer const *, std::ostream & os) const
+int InsetERT::docbook(Buffer const *, ostream & os) const
 {
 	Paragraph * par = inset.paragraph();
 	int lines = 0;
@@ -440,14 +451,14 @@ InsetERT::localDispatch(BufferView * bv, kb_action action, string const & arg)
 		set_latex_font(bv);
 	}
 
-	switch(action) {
+	switch (action) {
 	case LFUN_LAYOUT:
 		bv->owner()->setLayout(inset.paragraph()->getLayout());
 		break;
 	default:
 		result = InsetCollapsable::localDispatch(bv, action, arg);
 	}
-	switch(action) {
+	switch (action) {
 	case LFUN_BREAKPARAGRAPH:
 	case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
 	case LFUN_BACKSPACE:
@@ -471,7 +482,7 @@ string const InsetERT::get_new_label() const
 	string la;
 	pos_type const max_length = 15;
 	pos_type const p_siz = inset.paragraph()->size();
-	pos_type const n = std::min(max_length, p_siz);
+	pos_type const n = min(max_length, p_siz);
 	int i = 0;
 	int j = 0;
 	for(; i < n && j < p_siz; ++j) {
@@ -610,7 +621,7 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const
 {
 	if (st != status_) {
 		status_ = st;
-		switch(st) {
+		switch (st) {
 		case Inlined:
 			inset.setAutoBreakRows(false);
 			break;