anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Buffer.cpp:

Browse Source 
- re-assign a master's children if a child was reloaded (bug 5873)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29046 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2009-04-03 11:07:53 +00:00
parent c8d03a4d81
commit 49fdaa8507
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Buffer.cpp
View File

@ -608,6 +608,11 @@ bool Buffer::readDocument(Lexer & lex)
Buffer * master = Buffer * master =
checkAndLoadLyXFile(master_file, true); checkAndLoadLyXFile(master_file, true);
if (master) { if (master) {
// necessary e.g. after a reload
// to re-register the child (bug 5873)
// FIXME: clean up updateMacros (here, only
// child registering is needed).
master->updateMacros();
// set master as master buffer, but only // set master as master buffer, but only
// if we are a real child // if we are a real child
if (master->isChild(this)) if (master->isChild(this))
@ -618,9 +623,9 @@ bool Buffer::readDocument(Lexer & lex)
else if (master->isFullyLoaded()) else if (master->isFullyLoaded())
LYXERR0("The master '" LYXERR0("The master '"
<< params().master << params().master
<< "' assigned to this document '" << "' assigned to this document ("
<< absFileName() << absFileName()
<< "' does not include " << ") does not include "
"this document. Ignoring the master assignment."); "this document. Ignoring the master assignment.");
} }
} }