Replace home made temp file creation with safer (and cleaner) Qt' solution. Should...

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

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index 748ae3eca511b6e451a72f978971d997f502b6ca..9a21a89a788d14207ad85569f2ab7dd2e6b8e754 100644 (file)
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -21,9 +21,6 @@
 #include "support/docstream.h"
 #include "support/gettext.h"
 
-#include <ostream>
-
-
 namespace lyx {
 
 
@@ -38,22 +35,6 @@ docstring InsetMarginal::editMessage() const
 }
 
 
-docstring InsetMarginal::toolTip(BufferView const & bv, int x, int y) const
-{
-       docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
-       OutputParams rp(&buffer().params().encoding());
-       odocstringstream ods;
-       InsetText::plaintext(ods, rp);
-       docstring margin_tip = ods.str();
-       // shorten it if necessary
-       if (margin_tip.size() > 200)
-               margin_tip = margin_tip.substr(0, 200) + "...";
-       if (!isOpen() && !margin_tip.empty())
-               return margin_tip + '\n' + default_tip;
-       return default_tip;
-}
-
-
 int InsetMarginal::latex(odocstream & os, OutputParams const & runparams) const
 {
        os << "%\n\\marginpar{";
@@ -85,15 +66,17 @@ int InsetMarginal::docbook(odocstream & os,
 }
 
 
-void InsetMarginal::addToToc(ParConstIterator const & cpit) const
+void InsetMarginal::addToToc(DocIterator const & cpit)
 {
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(*this));
 
        Toc & toc = buffer().tocBackend().toc("marginalnote");
        docstring str;
        str = getNewLabel(str);
        toc.push_back(TocItem(pit, 0, str));
+       // Proceed with the rest of the inset.
+       InsetFootlike::addToToc(cpit);
 }
 
 } // namespace lyx