* src/BufferParams.{cpp, h}

* src/graphics/PreviewLoader.cpp:
	- make member writeEncodingPreamble void.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18543 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 916756e147630b6536a7eb189cfdf6cd05525f0b..f8d23ba3af104976b249f6fe1d6378131f17c6a7 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -907,7 +907,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        }
 
        // handle inputenc etc.
-       os << writeEncodingPreamble(features, texrow);
+       writeEncodingPreamble(os, features, texrow);
 
        if (!listings_params.empty()) {
                os << "\\usepackage{listings}\n";
@@ -1369,11 +1369,9 @@ string const BufferParams::babelCall(string const & lang_opts) const
 }
 
 
-docstring const BufferParams::writeEncodingPreamble(LaTeXFeatures & features,
-                             TexRow & texrow) const
+void BufferParams::writeEncodingPreamble(odocstream & os,
+               LaTeXFeatures & features, TexRow & texrow) const
 {
-       odocstringstream os;
-
        if (inputenc == "auto") {
                string const doc_encoding =
                        language->encoding()->latexName();
@@ -1429,8 +1427,6 @@ docstring const BufferParams::writeEncodingPreamble(LaTeXFeatures & features,
                os << "\\usepackage{armtex}\n";
                texrow.newline();
        }
-
-       return os.str();
 }
 
 

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 11049c3380f1da54579c12aac0c51a4e5ca66043..9b9136ff0e4c99bd43901734464514dbfc68fe14 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -254,7 +254,7 @@ public:
        /// set up if and how babel is called
        std::string const babelCall(std::string const & lang_opts) const;
        /// handle inputenc etc.
-       docstring const writeEncodingPreamble(LaTeXFeatures & features,
+       void writeEncodingPreamble(odocstream & os, LaTeXFeatures & features,
                                              TexRow & texrow) const;
        /// set up the document fonts
        std::string const loadFonts(std::string const & rm,

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index a06ca467fa161e788b7493cd617bd2bbe0756e71..e87f773d270a60af002c23294c562c1b276c6865 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -594,7 +594,7 @@ void PreviewLoader::Impl::startLoading()
        of << "\\batchmode\n";
        dumpPreamble(of);
        // handle inputenc etc.
-       of << buffer_.params().writeEncodingPreamble(features, texrow);
+       buffer_.params().writeEncodingPreamble(of, features, texrow);
        of << "\n\\begin{document}\n";
        dumpData(of, inprogress.snippets);
        of << "\n\\end{document}\n";