#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
-
-
-namespace lyx {
using namespace std;
+using namespace lyx::support;
-using support::addName;
-using support::bformat;
-using support::FileName;
-using support::libFileSearch;
-using support::makeAbsPath;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::onlyPath;
+namespace lyx {
namespace Alert = frontend::Alert;
if (filename.isReadableFile()) {
Buffer * b = theBufferList().newBuffer(filename.absFilename());
+ if (!b)
+ // Buffer creation is not possible.
+ return 0;
if (!b->loadLyXFile(filename)) {
theBufferList().release(b);
return 0;
{
// get a free buffer
Buffer * b = theBufferList().newBuffer(filename);
- BOOST_ASSERT(b);
+ if (!b)
+ // Buffer creation is not possible.
+ return 0;
FileName tname;
// use defaults.lyx as a default template if it exists.
if (prev_depth == min_depth)
return prev_par.itemdepth;
}
- min_depth = std::min(min_depth, prev_depth);
+ min_depth = min(min_depth, prev_depth);
// small optimization: if we are at depth 0, we won't
// find anything else
if (prev_depth == 0)
{
BOOST_ASSERT(parit.pit() == 0);
+ // set the position of the text in the buffer to be able
+ // to resolve macros in it. This has nothing to do with
+ // labels, but by putting it here we avoid implementing
+ // a whole bunch of traversal routines just for this call.
+ parit.text()->setMacrocontextPosition(parit);
+
depth_type maxdepth = 0;
pit_type const lastpit = parit.lastpit();
for ( ; parit.pit() <= lastpit ; ++parit.pit()) {