Revert "Fix bug with wrong baseline calculation in last paragraph"

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index 386625e18d2906896a943d84cf5777c5edf29378..29992f9ae78af32499bef78fffeabe5584137c75 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -230,8 +230,7 @@ public:
        /// read a new document from a string
        bool readString(std::string const &);
        /// Reloads the LyX file
-       /// \param clearUndo if false, leave alone the undo stack.
-       ReadStatus reload(bool clearUndo = true);
+       ReadStatus reload();
 //FIXME: The following function should be private
 //private:
        /// read the header, returns number of unknown tokens
@@ -511,6 +510,8 @@ public:
        ///
        BufferParams & params();
        BufferParams const & params() const;
+       ///
+       BufferParams const & masterParams() const;
 
        /** The list of paragraphs.
            This is a linked list of paragraph, this list holds the
@@ -593,7 +594,7 @@ public:
 
        /// get source code (latex/docbook) for some paragraphs, or all paragraphs
        /// including preamble
-       void getSourceCode(odocstream & os, std::string const format,
+       void getSourceCode(odocstream & os, std::string const & format,
                           pit_type par_begin, pit_type par_end, OutputWhat output,
                           bool master) const;