X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=3e6a4e3a2b11cf6e0d61de0627490985655117af;hb=27652900a60fd078f161ce866ddaed21dba21eff;hp=c396b1ebad48504f473786ba631814c9454908a6;hpb=fb424bae1b693200ba4a506b2775929d25d77be3;p=lyx.git

diff --git a/src/buffer.C b/src/buffer.C
index c396b1ebad..3e6a4e3a2b 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1278,10 +1278,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 			}
 			InsetMinipage * mini = new InsetMinipage;
 			mini->pos(static_cast<InsetMinipage::Position>(par->params().pextraAlignment()));
-			mini->pageWidth(par->params().pextraWidth());
+			mini->pageWidth(LyXLength(par->params().pextraWidth()));
 			if (!par->params().pextraWidthp().empty()) {
-			    lyxerr << "WP:" << mini->pageWidth() << endl;
-			    mini->pageWidth(tostr(par->params().pextraWidthp())+"%");
+			    lyxerr << "WP:" << mini->pageWidth().asString() << endl;
+			    mini->pageWidth(LyXLength((par->params().pextraWidthp())+"%"));
 			}
 			Paragraph * op = mini->firstParagraph();
 			mini->inset.paragraph(par);
@@ -1359,10 +1359,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 
 		InsetMinipage * mini = new InsetMinipage;
 		mini->pos(static_cast<InsetMinipage::Position>(minipar->params().pextraAlignment()));
-		mini->pageWidth(minipar->params().pextraWidth());
+		mini->pageWidth(LyXLength(minipar->params().pextraWidth()));
 		if (!par->params().pextraWidthp().empty()) {
-		    lyxerr << "WP:" << mini->pageWidth() << endl;
-		    mini->pageWidth(tostr(par->params().pextraWidthp())+"%");
+		    lyxerr << "WP:" << mini->pageWidth().asString() << endl;
+		    mini->pageWidth(LyXLength((par->params().pextraWidthp())+"%"));
 		}
 		mini->inset.paragraph(minipar);
 			
@@ -1513,8 +1513,8 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
 		} else if (tmptok == "Formula") {
 			inset = new InsetFormula;
 		} else if (tmptok == "Figure") { // Backward compatibility
-			inset = new InsetFig(100, 100, *this);
-			//inset = new InsetGraphics;
+//			inset = new InsetFig(100, 100, *this);
+			inset = new InsetGraphics;
 		} else if (tmptok == "Graphics") {
 			inset = new InsetGraphics;
 		} else if (tmptok == "Info") {// backwards compatibility
@@ -2545,15 +2545,15 @@ void Buffer::latexParagraphs(ostream & ofs, Paragraph * par,
 		if ((in == 0) || !in->forceDefaultParagraphs(in)) {
 			LyXLayout const & layout =
 				textclasslist.Style(params.textclass, par->layout);
-	    
-	        if (layout.intitle) {
+			
+			if (layout.intitle) {
 				if (already_title) {
 					lyxerr <<"Error in latexParagraphs: You"
 						" should not mix title layouts"
 						" with normal ones." << endl;
 				} else
 					was_title = true;
-	        } else if (was_title && !already_title) {
+			} else if (was_title && !already_title) {
 				ofs << "\\maketitle\n";
 				texrow.newline();
 				already_title = true;