anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-02 14:01:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix assertion on exit when quitting.

Browse Source 
Wraning for everybody: don't use static Buffer object, always pass through theBufferList().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27677 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2008-11-23 08:37:14 +00:00
parent 9062958419
commit 21b78c8d5a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mathed/MacroTable.cpp
View File

@ -19,17 +19,19 @@
#include "InsetMathNest.h" #include "InsetMathNest.h"
#include "Buffer.h" #include "Buffer.h"
#include "BufferList.h"
#include "DocIterator.h" #include "DocIterator.h"
#include "InsetList.h" #include "InsetList.h"
#include "Text.h" #include "Text.h"
#include "support/debug.h" #include "support/debug.h"
#include "support/FileName.h"
#include "support/lassert.h" #include "support/lassert.h"
#include <sstream> #include <sstream>
using namespace std; using namespace std;
using namespace lyx::support;
namespace lyx { namespace lyx {
@ -68,14 +70,19 @@ void MacroData::expand(vector<MathData> const & args, MathData & to) const
updateData(); updateData();
// Hack. Any inset with a cell would do. // Hack. Any inset with a cell would do.
static Buffer buffer(""); static Buffer * buffer = 0;
if (!buffer) {
buffer = theBufferList().newBuffer(
FileName::tempName().absFilename() + "_macrodata.internal");
buffer->setUnnamed(true);
}
static InsetMathSqrt inset; static InsetMathSqrt inset;
// FIXME UNICODE // FIXME UNICODE
asArray(display_.empty() ? definition_ : display_, inset.cell(0)); asArray(display_.empty() ? definition_ : display_, inset.cell(0));
//lyxerr << "MathData::expand: args: " << args << endl; //lyxerr << "MathData::expand: args: " << args << endl;
//lyxerr << "MathData::expand: ar: " << inset.cell(0) << endl; //lyxerr << "MathData::expand: ar: " << inset.cell(0) << endl;
for (DocIterator it = doc_iterator_begin(&buffer, &inset); it; it.forwardChar()) { for (DocIterator it = doc_iterator_begin(buffer, &inset); it; it.forwardChar()) {
if (!it.nextInset()) if (!it.nextInset())
continue; continue;
if (it.nextInset()->lyxCode() != MATHMACROARG_CODE) if (it.nextInset()->lyxCode() != MATHMACROARG_CODE)