Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp
index 00b6235349ebf969b4e6dbcb2f97a0d7353cacb9..76a8dc9d1bfbe3f0b240a7908f853a1fb1d70d32 100644 (file)
--- a/src/insets/InsetTOC.cpp
+++ b/src/insets/InsetTOC.cpp
@@ -148,8 +148,8 @@ void InsetTOC::makeTOCEntry(XHTMLStream & xs,
 }
 
 
-void InsetTOC::makeTOCWithDepth(XHTMLStream xs, 
-               Toc toc, OutputParams const & op) const
+void InsetTOC::makeTOCWithDepth(XHTMLStream & xs, 
+               Toc const & toc, OutputParams const & op) const
 {
        Toc::const_iterator it = toc.begin();
        Toc::const_iterator const en = toc.end();
@@ -206,8 +206,8 @@ void InsetTOC::makeTOCWithDepth(XHTMLStream xs,
 }
 
 
-void InsetTOC::makeTOCNoDepth(XHTMLStream xs, 
-               Toc toc, const OutputParams & op) const
+void InsetTOC::makeTOCNoDepth(XHTMLStream & xs, 
+               Toc const & toc, const OutputParams & op) const
 {
        Toc::const_iterator it = toc.begin();
        Toc::const_iterator const en = toc.end();
@@ -235,8 +235,9 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
                LASSERT(false, return docstring());
        }
 
-       Toc const & toc = buffer().tocBackend().toc(cmd2type(command));
-       if (toc.empty())
+       shared_ptr<Toc const> toc =
+               buffer().masterBuffer()->tocBackend().toc(cmd2type(command));
+       if (toc->empty())
                return docstring();
 
        // we'll use our own stream, because we are going to defer everything.
@@ -264,9 +265,9 @@ docstring InsetTOC::xhtml(XHTMLStream &, OutputParams const & op) const
 
        // Output of TOC
        if (use_depth)
-               makeTOCWithDepth(xs, toc, op);
+               makeTOCWithDepth(xs, *toc, op);
        else
-               makeTOCNoDepth(xs, toc, op);
+               makeTOCNoDepth(xs, *toc, op);
 
        xs << html::EndTag("div") << html::CR();
        return ods.str();