X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetgraphics.C;h=dd591b24522174529acae38fb4a273736b386f04;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=ff7dd2b86629588d7bc37a883a795a309c21c6e9;hpb=fa492d6bf09db7f1c278687e0000ad1c4833af3d;p=lyx.git

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index ff7dd2b866..dd591b2452 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -22,13 +22,16 @@
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 
+using std::ostream;
+using std::endl;
+
 extern string system_lyxdir;
 extern string user_lyxdir;
 extern string system_tempdir;
 
 string browseFile();
 
-void GraphicxCB(FL_OBJECT * obj, long arg) 
+extern "C" void GraphicxCB(FL_OBJECT * obj, long arg) 
 {
 	lyxerr << "GraphicxCB: obj = " << obj << " arg = " << arg << endl;
 	switch (arg) {
@@ -188,7 +191,8 @@ void InsetGraphics::Read(LyXLex & /*lex*/)
 }
 
 
-int InsetGraphics::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) const
+int InsetGraphics::Latex(ostream & os,
+			 bool /*fragile*/, bool/*fs*/) const
 {
 	// MISSING: We have to decide how to do the order of the options
 	// that is depentant of order, like witdth, height, andlge. Should
@@ -201,7 +205,7 @@ int InsetGraphics::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) cons
 	string command("\\insetgraphics");
 	
 #ifdef HAVE_SSTREAM
-	ostringstream options;
+	std::ostringstream options;
 #else
 	ostrstream options;
 #endif
@@ -330,6 +334,12 @@ int InsetGraphics::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) cons
 }
 
 
+int InsetGraphics::Ascii(ostream &) const
+{
+	return 0;
+}
+
+
 int InsetGraphics::Linuxdoc(ostream &) const
 {
 	return 0;