X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffactory.C;h=03a285a3c3e0e007b6eea7644f1f28878602148c;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=42a61848c4bfdfc1eae7c422c0342784c4edf7b1;hpb=c4762f94524c53ffc2200016678b4d032013b366;p=lyx.git

diff --git a/src/factory.C b/src/factory.C
index 42a61848c4..03a285a3c3 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -60,10 +60,11 @@
 #include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 
 #include <boost/assert.hpp>
 
+#include <sstream>
+
 using lyx::support::compare_ascii_no_case;
 
 using std::auto_ptr;
@@ -186,7 +187,7 @@ InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
 		if (!up) {
 			auto_ptr<InsetCaption> inset(new InsetCaption(params));
 			inset->setAutoBreakRows(true);
-			inset->setDrawFrame(InsetText::LOCKED);
+			inset->setDrawFrame(true);
 			inset->setFrameColor(LColor::captionframe);
 			return inset.release();
 		}
@@ -470,7 +471,9 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf)
 
 		inset->read(buf, lex);
 
+#ifdef WITH_WARNINGS
 #warning hack..
+#endif
 		if (inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
 			MathMacroTemplate const * tmpl =
 				static_cast<MathMacroTemplate*>(inset.get());