BUG 3598: display framed and shaded notes in a separate paragraph, require package...

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

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 40550f52079f07c96b7a0da284f5a7eb2b60fe1f..ad144d2428af5c8d24704402bf51ddfafebb5f67 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -153,7 +153,7 @@ InsetGraphics::InsetGraphics()
 
 
 InsetGraphics::InsetGraphics(InsetGraphics const & ig)
-       : InsetBase(ig),
+       : Inset(ig),
          boost::signals::trackable(),
                graphic_label(sgml::uniqueID(from_ascii("graph"))),
          graphic_(new RenderGraphic(*ig.graphic_, this))
@@ -162,9 +162,9 @@ InsetGraphics::InsetGraphics(InsetGraphics const & ig)
 }
 
 
-auto_ptr<InsetBase> InsetGraphics::doClone() const
+auto_ptr<Inset> InsetGraphics::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetGraphics(*this));
+       return auto_ptr<Inset>(new InsetGraphics(*this));
 }
 
 
@@ -205,7 +205,7 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        default:
-               InsetBase::doDispatch(cur, cmd);
+               Inset::doDispatch(cur, cmd);
                break;
        }
 }
@@ -222,7 +222,7 @@ bool InsetGraphics::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        default:
-               return InsetBase::getStatus(cur, cmd, flag);
+               return Inset::getStatus(cur, cmd, flag);
        }
 }
 
@@ -249,7 +249,7 @@ void InsetGraphics::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-InsetBase::EDITABLE InsetGraphics::editable() const
+Inset::EDITABLE InsetGraphics::editable() const
 {
        return IS_EDITABLE;
 }
@@ -807,7 +807,7 @@ int InsetGraphics::latex(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetGraphics::plaintext(Buffer const &, odocstream & os,
+int InsetGraphics::plaintext(Buffer const & buf, odocstream & os,
                              OutputParams const &) const
 {
        // No graphics in ascii output. Possible to use gifscii to convert
@@ -818,7 +818,7 @@ int InsetGraphics::plaintext(Buffer const &, odocstream & os,
        // FIXME UNICODE
        // FIXME: We have no idea what the encoding of the filename is
 
-       docstring const str = bformat(_("Graphics file: %1$s"),
+       docstring const str = bformat(buf.B_("Graphics file: %1$s"),
                                      from_utf8(params().filename.absFilename()));
        os << '<' << str << '>';