prevent crash when inserting minipage in table cell,

[lyx.git] / src / insets / insetgraphics.C

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 9410d89655d64865af2a22fce501954f79028fa2..c2b4a355f7e43ec987f3d1cdb60b42c8b5e72877 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -82,13 +82,13 @@ TODO
 
 #include <algorithm> // For the std::max
 
-extern string system_tempdir;
 // set by Exporters
 
 using namespace lyx::support;
 
 using std::ostream;
 using std::endl;
+using std::auto_ptr;
 
 
 namespace {
@@ -143,7 +143,7 @@ InsetGraphics::InsetGraphics()
 
 
 InsetGraphics::InsetGraphics(InsetGraphics const & ig)
-       : Inset(ig),
+       : InsetOld(ig),
          boost::signals::trackable(),
          graphic_label(uniqueID()),
          graphic_(new GraphicRenderer(*ig.graphic_))
@@ -153,9 +153,9 @@ InsetGraphics::InsetGraphics(InsetGraphics const & ig)
 }
 
 
-InsetBase * InsetGraphics::clone() const
+auto_ptr<InsetBase> InsetGraphics::clone() const
 {
-       return new InsetGraphics(*this);
+       return auto_ptr<InsetBase>(new InsetGraphics(*this));
 }
 
 
@@ -197,7 +197,7 @@ dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd)
                return DISPATCHED;
 
        default:
-               return Inset::localDispatch(cmd);
+               return InsetOld::localDispatch(cmd);
        }
 }
 
@@ -215,7 +215,7 @@ void InsetGraphics::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-Inset::EDITABLE InsetGraphics::editable() const
+InsetOld::EDITABLE InsetGraphics::editable() const
 {
        return IS_EDITABLE;
 }
@@ -468,7 +468,7 @@ int InsetGraphics::latex(Buffer const * buf, ostream & os,
                << "insetgraphics::latex: Filename = "
                << params().filename.absFilename() << endl;
 
-       string const relative_file = 
+       string const relative_file =
                params().filename.relFilename(buf->filePath());
 
        // A missing (e)ps-extension is no problem for LaTeX, so
@@ -550,9 +550,14 @@ int InsetGraphics::ascii(Buffer const *, ostream & os, int) const
 }
 
 
-int InsetGraphics::linuxdoc(Buffer const *, ostream &) const
+int InsetGraphics::linuxdoc(Buffer const * buf, ostream & os) const
 {
-       // No graphics in LinuxDoc output. Should check how/what to add.
+       string const file_name = buf->niceFile ?
+                               params().filename.relFilename(buf->filePath()):
+                               params().filename.absFilename();
+
+       os << "<eps file=\"" << file_name << "\">\n";
+       os << "<img src=\"" << file_name << "\">";
        return 0;
 }
 
@@ -625,7 +630,7 @@ string const InsetGraphicsMailer::inset2string(Buffer const & buffer) const
 
 void InsetGraphicsMailer::string2params(string const & in,
                                        Buffer const & buffer,
-                                       InsetGraphicsParams & params)
+                                       InsetGraphicsParams & params)
 {
        params = InsetGraphicsParams();