Some things did not need to be mutable after all

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

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index b405cd2cfdf34e6c9537370389bc2467687815cc..b369ce1b7e7d915f66aa675fd4f88e056219eac9 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -20,6 +20,7 @@
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 #include "Text.h"
 #include "TextMetrics.h"
 
@@ -47,7 +48,6 @@ InsetNewpage::InsetNewpage(InsetNewpageParams const & params)
 
 void InsetNewpageParams::write(ostream & os) const
 {
-       string command;
        switch (kind) {
        case InsetNewpageParams::NEWPAGE:
                os << "newpage";
@@ -213,13 +213,15 @@ ColorCode InsetNewpage::ColorName() const
 }
 
 
-int InsetNewpage::latex(odocstream & os, OutputParams const &) const
+void InsetNewpage::latex(otexstream & os, OutputParams const & runparams) const
 {
        switch (params_.kind) {
                case InsetNewpageParams::NEWPAGE:
                        os << "\\newpage{}";
                        break;
                case InsetNewpageParams::PAGEBREAK:
+                       if (runparams.moving_arg)
+                               os << "\\protect";
                        os << "\\pagebreak{}";
                        break;
                case InsetNewpageParams::CLEARPAGE:
@@ -232,11 +234,11 @@ int InsetNewpage::latex(odocstream & os, OutputParams const &) const
                        os << "\\newpage{}";
                        break;
        }
-       return 0;
 }
 
 
-int InsetNewpage::plaintext(odocstream & os, OutputParams const &) const
+int InsetNewpage::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
        os << '\n';
        return PLAINTEXT_NEWLINE;
@@ -257,9 +259,9 @@ docstring InsetNewpage::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-docstring InsetNewpage::contextMenuName() const
+string InsetNewpage::contextMenuName() const
 {
-       return from_ascii("context-newpage");
+       return "context-newpage";
 }