Cure warning message about a missing '\end_inset' when passing data between

the core and the dialogs.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6409 a592a061-630c-0410-9148-cb99ea01b6c8

src/insets/ChangeLog

@@ -1,3 +1,15 @@
+2003-03-10  Angus Leeming  <leeming@lyx.org>
+
+	* insetcommand.C (string2params):
+	* insetexternal.C (string2params):
+	* insetfloat.C (string2params):
+	* insetgraphics.C (string2params):
+	* insetinclude.C (string2params):
+	* insetminipage.C (string2params):
+	* insettabular.C (string2params):
+	* insetwrap.C (string2params): cure warning message about missing
+	'\end_inset'.
+
 2003-03-09  Angus Leeming  <leeming@lyx.org>
 
 	* insettabular.[Ch]: define a new class InsetTabularMailer and use

src/insets/insetcommand.C

@@ -127,7 +127,17 @@ void InsetCommandMailer::string2params(string const & in,
 		string const name = lex.getString();
 	}
 
-	params.read(lex);
+	// This is part of the inset proper that is usually swallowed
+	// by Buffer::readInset
+	if (lex.isOK()) {
+		lex.next();
+		string const token = lex.getString();
+		if (token != "LatexCommand")
+			return;
+	}
+	if (lex.isOK()) {
+		params.read(lex);
+	}
 }
 
 

src/insets/insetexternal.C

@@ -401,9 +401,11 @@ void InsetExternalMailer::string2params(string const & in,
 			return;
 	}
 
-	InsetExternal inset;	
-	inset.read(0, lex);
-	params = inset.params();
+	if (lex.isOK()) {
+		InsetExternal inset;	
+		inset.read(0, lex);
+		params = inset.params();
+	}
 }
 
 

src/insets/insetfloat.C

@@ -440,7 +440,9 @@ void InsetFloatMailer::string2params(string const & in,
 			return;
 	}
 
-	params.read(lex);
+	if (lex.isOK()) {
+		params.read(lex);
+	}
 }
 
 

src/insets/insetgraphics.C

@@ -907,9 +907,11 @@ void InsetGraphicsMailer::string2params(string const & in,
 			return;
 	}
 
-	InsetGraphics inset;	
-	inset.readInsetGraphics(lex);
-	params = inset.params();
+	if (lex.isOK()) {
+		InsetGraphics inset;	
+		inset.readInsetGraphics(lex);
+		params = inset.params();
+	}
 }
 
 

src/insets/insetinclude.C

@@ -667,9 +667,11 @@ void InsetIncludeMailer::string2params(string const & in,
 			return;
 	}
 
-	InsetInclude inset(params);	
-	inset.read(0, lex);
-	params = inset.params();
+	if (lex.isOK()) {
+		InsetInclude inset(params);	
+		inset.read(0, lex);
+		params = inset.params();
+	}
 }
 
 

src/insets/insetminipage.C

@@ -445,7 +445,9 @@ void InsetMinipageMailer::string2params(string const & in,
 			return;
 	}
 
-	params.read(lex);
+	if (lex.isOK()) {
+		params.read(lex);
+	}
 }
 
 

src/insets/insettabular.C

@@ -3085,6 +3085,9 @@ int InsetTabularMailer::string2params(string const & in, InsetTabular & inset)
 			return -1;
 	}
 
+	if (!lex.isOK())
+		return -1;
+
 	BufferView * const bv = inset.view();
 	Buffer const * const buffer = bv ? bv->buffer() : 0;
 	if (buffer)

src/insets/insetwrap.C

@@ -355,7 +355,9 @@ void InsetWrapMailer::string2params(string const & in,
 			return;
 	}
 
-	params.read(lex);
+	if (lex.isOK()) {
+		params.read(lex);
+	}
 }