Fix GRAPHICS_EDIT of InsetGraphics

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

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index e2a6cacbe560fc92bafb3063d071478039e12edc..d61346d342db57fb41038c515b22e00c0c03a206 100644 (file)
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -30,9 +30,6 @@
 #include "paragraph_funcs.h"
 #include "sgml.h"
 
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
-
 #include "support/convert.h"
 
 #include <sstream>
@@ -42,13 +39,14 @@ using namespace std;
 namespace lyx {
 
 
-InsetFlex::InsetFlex(BufferParams const & bp,
-                               InsetLayout const & il)
-       : InsetCollapsable(bp, Collapsed, &il)
+InsetFlex::InsetFlex(Buffer const & buf,
+       DocumentClass * dc, string const & layoutName)
+       : InsetCollapsable(buf, Collapsed, dc),
+       name_(layoutName)
 {
-       name_ = il.name;
-       packages_ = il.requires;
-       preamble_ = il.preamble;
+       setLayout(dc); // again, because now the name is initialized
+       packages_ = getLayout().requires();
+       preamble_ = getLayout().preamble();
 }
 
 
@@ -57,32 +55,21 @@ InsetFlex::InsetFlex(InsetFlex const & in)
 {}
 
 
-Inset * InsetFlex::clone() const
-{
-       return new InsetFlex(*this);
-}
-
-
-bool InsetFlex::undefined() const
-{
-       return layout_->labelstring == from_utf8("UNDEFINED");
-}
-
-
-docstring const InsetFlex::editMessage() const
+docstring InsetFlex::editMessage() const
 {
        return _("Opened Flex Inset");
 }
 
 
-void InsetFlex::write(Buffer const & buf, ostream & os) const
+void InsetFlex::write(ostream & os) const
 {
-       os << "Flex " << name_ << "\n";
-       InsetCollapsable::write(buf, os);
+       os << "Flex " <<
+               (name_.empty() ? "undefined" : name_) << "\n";
+       InsetCollapsable::write(os);
 }
 
 
-void InsetFlex::read(Buffer const & buf, Lexer & lex)
+void InsetFlex::read(Lexer & lex)
 {
        while (lex.isOK()) {
                lex.next();
@@ -99,44 +86,42 @@ void InsetFlex::read(Buffer const & buf, Lexer & lex)
                        break;
                }
        }
-       InsetCollapsable::read(buf, lex);
+       InsetCollapsable::read(lex);
 }
 
 
-int InsetFlex::plaintext(Buffer const & buf, odocstream & os,
-                             OutputParams const & runparams) const
+int InsetFlex::plaintext(odocstream & os, OutputParams const & runparams) const
 {
-       return InsetText::plaintext(buf, os, runparams);
+       return InsetText::plaintext(os, runparams);
 }
 
 
-int InsetFlex::docbook(Buffer const & buf, odocstream & os,
-                           OutputParams const & runparams) const
+int InsetFlex::docbook(odocstream & os, OutputParams const & runparams) const
 {
        ParagraphList::const_iterator beg = paragraphs().begin();
        ParagraphList::const_iterator par = paragraphs().begin();
        ParagraphList::const_iterator end = paragraphs().end();
 
        if (!undefined())
-               sgml::openTag(os, layout_->latexname,
-                             par->getID(buf, runparams) + layout_->latexparam);
+               sgml::openTag(os, getLayout().latexname(),
+                             par->getID(buffer(), runparams) + getLayout().latexparam());
 
        for (; par != end; ++par) {
-               par->simpleDocBookOnePar(buf, os, runparams,
+               par->simpleDocBookOnePar(buffer(), os, runparams,
                                         outerFont(distance(beg, par),
                                                   paragraphs()));
        }
 
        if (!undefined())
-               sgml::closeTag(os, layout_->latexname);
+               sgml::closeTag(os, getLayout().latexname());
 
        return 0;
 }
 
 
-void InsetFlex::textString(Buffer const & buf, odocstream & os) const
+void InsetFlex::textString(odocstream & os) const
 {
-       os << paragraphs().begin()->asString(buf, true);
+       os << paragraphs().begin()->asString(true);
 }
 
 
@@ -144,12 +129,7 @@ void InsetFlex::validate(LaTeXFeatures & features) const
 {
        if (!preamble_.empty())
                features.addPreambleSnippet(preamble_);
-       if (packages_.empty())
-               return;
-       for (vector<string>::const_iterator it = packages_.begin();
-            it != packages_.end(); ++it) {
-               features.require(*it);
-       }
+       features.require(packages_);
 }
 
 } // namespace lyx