Enable the external inset to handle unknown templates gracefully.

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

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 5f492c074536dc36dd0bea5d909fea2cd8c5a4d0..6b25e65864ae634917b44f4720f1e97f1a453e60 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -192,24 +192,16 @@ void InsetInclude::set(Params const & p)
 }
 
 
-Inset * InsetInclude::clone(Buffer const & buffer) const
+Inset * InsetInclude::clone() const
 {
-       Params p(params_);
-       p.masterFilename_ = buffer.fileName();
+       //Params p(params_);
+       //p.masterFilename_ = buffer.fileName();
+#warning FIXME: broken cross-doc copy/paste - must fix
 
-       return new InsetInclude(p);
+       return new InsetInclude(params_);
 }
 
 
-// Inset * InsetInclude::clone(Buffer const & buffer, bool) const
-// {
-//     Params p(params_);
-//     p.masterFilename_ = buffer.fileName();
-
-//     return new InsetInclude(p);
-// }
-
-
 void InsetInclude::write(Buffer const *, ostream & os) const
 {
        os << "Include " << params_.cparams.getCommand() << '\n'
@@ -512,24 +504,16 @@ void InsetInclude::fillWithBibKeys(vector<pair<string,string> > & keys) const
 }
 
 
-int InsetInclude::ascent(BufferView * bv, LyXFont const & font) const
-{
-       return preview_->previewReady() ?
-               preview_->pimage()->ascent() : InsetButton::ascent(bv, font);
-}
-
-
-int InsetInclude::descent(BufferView * bv, LyXFont const & font) const
+void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       return preview_->previewReady() ?
-               preview_->pimage()->descent() : InsetButton::descent(bv, font);
-}
-
-
-int InsetInclude::width(BufferView * bv, LyXFont const & font) const
-{
-       return preview_->previewReady() ?
-               preview_->pimage()->width() : InsetButton::width(bv, font);
+       if (preview_->previewReady()) {
+               dim.asc = preview_->pimage()->ascent();
+               dim.des = preview_->pimage()->descent();
+               dim.wid = preview_->pimage()->width();
+       } else {
+               InsetButton::metrics(mi, dim);
+       }
+       dim_ = dim;
 }
 
 
@@ -544,10 +528,7 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const
        if (!preview_->monitoring())
                preview_->startMonitoring();
 
-       Dimension dim;
-       dimension(pi.base.bv, pi.base.font, dim);
-
-       pi.pain.image(x, y - dim.asc, dim.wid, dim.height(),
+       pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(),
                            *(preview_->pimage()->image()));
 }