anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* GuiDocument.cpp (dispatchParams):

Browse Source 
- do not set master buffer and warn if the master does not include child
	- issue warning if the master could not be loaded.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28033 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2009-01-08 07:59:37 +00:00
parent 32c8e4f820
commit 454a2d4832
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontends/qt4/GuiDocument.cpp
View File

@ -2365,7 +2365,19 @@ void GuiDocument::dispatchParams()
support::onlyPath(buffer().absFileName())); support::onlyPath(buffer().absFileName()));
if (isLyXFilename(master_file.absFilename())) { if (isLyXFilename(master_file.absFilename())) {
Buffer * master = checkAndLoadLyXFile(master_file); Buffer * master = checkAndLoadLyXFile(master_file);
const_cast<Buffer &>(buffer()).setParent(master); if (master) {
if (master->isChild(const_cast<Buffer *>(&buffer())))
const_cast<Buffer &>(buffer()).setParent(master);
else
Alert::warning(_("Assigned master does not include this file"),
bformat(_("You must include this file in the document\n"
"'%1$s' in order to use the master document\n"
"feature."), from_utf8(params().master)));
} else
Alert::warning(_("Could not load master"),
bformat(_("The master file '%1$s'\n"
"could not be loaded."),
from_utf8(params().master)));
} }
} }