#7379 avoid the wrap spell check question when buffer is empty

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 995a4ad693b465d4fcaf95b0df8ea21644fb07ab..9c9f862839351e8d50268ba661863d12de7c2f09 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -220,10 +220,10 @@ bool InsetNote::isMacroScope() const
 }
 
 
-int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        if (params_.type == InsetNoteParams::Note)
-               return 0;
+               return;
 
        OutputParams runparams(runparams_in);
        if (params_.type == InsetNoteParams::Comment) {
@@ -232,8 +232,6 @@ int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const
                runparams.exportdata.reset(new ExportData);
        } 
 
-       odocstringstream ss;
-       InsetCollapsable::latex(ss, runparams);
        // the space after the comment in 'a[comment] b' will be eaten by the
        // comment environment since the space before b is ignored with the
        // following latex output:
@@ -245,14 +243,13 @@ int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const
        //  b
        //
        // Adding {} before ' b' fixes this.
-       if (params_.type == InsetNoteParams::Comment)
-               ss << "{}";
+       // The {} will be automatically added, but only if needed, for all
+       // insets whose InsetLayout Display tag is false. This is achieved
+       // by telling otexstream to protect an immediately following space
+       // and is done for both comment and greyedout insets.
+       InsetCollapsable::latex(os, runparams);
 
-       docstring const str = ss.str();
-       os << str;
        runparams_in.encoding = runparams.encoding;
-       // Return how many newlines we issued.
-       return int(count(str.begin(), str.end(), '\n'));
 }