* src/paragraph_funcs.cpp (breakParagraph): change parameter 'flag' to

[lyx.git] / src / insets / RenderGraphic.cpp

diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index d305024192c0788e80bab2821022f705b03973a8..42d2d776a4f68b53121468fad8049df88c13087e 100644 (file)
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -35,7 +35,6 @@ namespace lyx {
 using support::onlyFilename;
 
 using std::string;
-using std::auto_ptr;
 
 
 RenderGraphic::RenderGraphic(Inset const * inset)
@@ -56,9 +55,9 @@ RenderGraphic::RenderGraphic(RenderGraphic const & other,
 }
 
 
-auto_ptr<RenderBase> RenderGraphic::clone(Inset const * inset) const
+RenderBase * RenderGraphic::clone(Inset const * inset) const
 {
-       return auto_ptr<RenderBase>(new RenderGraphic(*this, inset));
+       return new RenderGraphic(*this, inset);
 }
 
 
@@ -140,7 +139,7 @@ bool readyToDisplay(graphics::Loader const & loader)
 } // namespace anon
 
 
-bool RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
+void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        bool image_ready = displayGraphic(params_) && readyToDisplay(loader_);
 
@@ -157,7 +156,7 @@ bool RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
                msgFont.setFamily(Font::SANS_FAMILY);
 
                // FIXME UNICODE
-               docstring const justname = 
+               docstring const justname =
                        from_utf8(onlyFilename(params_.filename.absFilename()));
                if (!justname.empty()) {
                        msgFont.setSize(Font::SIZE_FOOTNOTE);
@@ -175,9 +174,7 @@ bool RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.wid = std::max(50, font_width + 15);
        }
 
-       bool const changed = dim_ != dim;
        dim_ = dim;
-       return changed;
 }