* do not ignore "requires" field in MathMacro

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2538f590d421750ae7912b80dbfe40ff983c38ba..e7a5d41bd77a2224d42e3fb7571e886e1c8f9a66 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -33,7 +33,7 @@
 #include "LaTeXFeatures.h"
 #include "LyXAction.h"
 #include "Lexer.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "LyXRC.h"
 #include "LyXVC.h"
 #include "Messages.h"
@@ -141,7 +141,7 @@ using std::string;
 
 namespace {
 
-int const LYX_FORMAT = 265;
+int const LYX_FORMAT = 267;
 
 } // namespace anon
 
@@ -184,7 +184,7 @@ public:
         */
        bool file_fully_loaded;
 
-       /// our LyXText that should be wrapped in an InsetText
+       /// our Text that should be wrapped in an InsetText
        InsetText inset;
 
        ///
@@ -236,9 +236,9 @@ Buffer::~Buffer()
 }
 
 
-LyXText & Buffer::text() const
+Text & Buffer::text() const
 {
-       return const_cast<LyXText &>(pimpl_->inset.text_);
+       return const_cast<Text &>(pimpl_->inset.text_);
 }
 
 
@@ -1451,11 +1451,7 @@ Language const * Buffer::getLanguage() const
 
 docstring const Buffer::B_(string const & l10n) const
 {
-       Language const * lang = pimpl_->params.language;
-       if (lang)
-               return getMessages(lang->code()).get(l10n);
-
-       return _(l10n);
+       return params().B_(l10n);
 }