Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 718ce4eefef880176d16ea54176bf22d0352e4c7..2d289556447ee48817ef83247f7d8909c5205746 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -24,13 +24,10 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetList.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "TextClass.h"
-#include "TocBackend.h"
 
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
@@ -45,7 +42,7 @@ namespace lyx {
 InsetWrap::InsetWrap(Buffer const & buf, string const & type)
        : InsetCollapsable(buf)
 {
-       setLabel(_("wrap: ") + floatName(type, buf.params()));
+       setLabel(_("wrap: ") + floatName(type));
        params_.type = type;
        params_.lines = 0;
        params_.placement = "o";
@@ -107,7 +104,6 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
        switch (cmd.action) {
        case LFUN_INSET_MODIFY:
        case LFUN_INSET_DIALOG_UPDATE:
-       case LFUN_INSET_SETTINGS:
                flag.setEnabled(true);
                return true;
 
@@ -119,7 +115,7 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetWrap::updateLabels(ParIterator const & it)
 {
-       setLabel(_("wrap: ") + floatName(params_.type, buffer().params()));
+       setLabel(_("wrap: ") + floatName(params_.type));
        Counters & cnts =
                buffer().masterBuffer()->params().documentClass().counters();
        string const saveflt = cnts.current_float();
@@ -206,7 +202,7 @@ int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
 int InsetWrap::plaintext(odocstream & os, OutputParams const & runparams) const
 {
        os << '[' << buffer().B_("wrap") << ' '
-               << floatName(params_.type, buffer().params()) << ":\n";
+               << floatName(params_.type) << ":\n";
        InsetText::plaintext(os, runparams);
        os << "\n]";
 
@@ -224,6 +220,21 @@ int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
+docstring InsetWrap::xhtml(odocstream &, OutputParams const & rp) const
+{
+       string const len = params_.width.asHTMLString();
+       docstring retval = from_ascii("<div class='wrap'");
+       if (!len.empty())
+               retval += from_ascii(" style='width: " + len + ";");
+       retval += from_ascii("'>");
+       odocstringstream os;
+       docstring const deferred = InsetText::xhtml(os, rp);
+       retval += os.str() + from_ascii("</div>");
+       retval += deferred;
+       return retval;
+}
+
+
 bool InsetWrap::insetAllowed(InsetCode code) const
 {
        switch(code) {
@@ -246,29 +257,6 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 }
 
 
-docstring InsetWrap::getCaptionText(OutputParams const & runparams) const
-{
-       if (paragraphs().empty())
-               return docstring();
-
-       ParagraphList::const_iterator pit = paragraphs().begin();
-       for (; pit != paragraphs().end(); ++pit) {
-               InsetList::const_iterator it = pit->insetList().begin();
-               for (; it != pit->insetList().end(); ++it) {
-                       Inset & inset = *it->inset;
-                       if (inset.lyxCode() == CAPTION_CODE) {
-                               odocstringstream ods;
-                               InsetCaption * ins =
-                                       static_cast<InsetCaption *>(it->inset);
-                               ins->getCaptionText(ods, runparams);
-                               return ods.str();
-                       }
-               }
-       }
-       return docstring();
-}
-
-
 void InsetWrap::string2params(string const & in, InsetWrapParams & params)
 {
        params = InsetWrapParams();