Remove special code for CJK that is no longer required (amends e665715fc4).

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 0fbc2e707a106a4a1bd1fb676b24a5e31fca40b7..229d1be6a5de027d9d7bca7f9c5d01b93954f7b3 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -136,7 +136,9 @@ public:
        /// NOTE: This does not call makeDocumentClass() to update the local
        /// DocumentClass. That needs to be done manually.
        /// \param classname: the name of the layout file
-       bool setBaseClass(std::string const & classname);
+       /// \param path: non-empty only for local layout files
+       bool setBaseClass(std::string const & classname,
+                         std::string const & path = std::string());
        /// Adds the module information to the baseClass information to
        /// create our local DocumentClass.
        /// NOTE: This should NEVER be called externally unless one immediately goes
@@ -546,6 +548,10 @@ public:
        bool setLanguage(std::string const & lang);
        ///
        void invalidateConverterCache() const;
+       /// Copies over some of the settings from \param bp,
+       /// namely the ones need by Advanced F&R. We don't want
+       /// to copy them all, e.g., not the default master.
+       void copyForAdvFR(BufferParams const & bp);
 
 private:
        ///
@@ -614,7 +620,6 @@ private:
                static void destroy(Impl *);
        };
        support::copied_ptr<Impl, MemoryTraits> pimpl_;
-
 };
 
 } // namespace lyx