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

* Buffer.cpp:

Browse Source 
- do not set master_file as master buffer if the document s no real child (bug 5653).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28021 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2009-01-07 07:58:16 +00:00
parent caec13bafa
commit 765adf1dd0
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Buffer.cpp
View File

@ -579,8 +579,17 @@ bool Buffer::readDocument(Lexer & lex)
FileName const master_file = makeAbsPath(params().master, FileName const master_file = makeAbsPath(params().master,
onlyPath(absFileName())); onlyPath(absFileName()));
if (isLyXFilename(master_file.absFilename())) { if (isLyXFilename(master_file.absFilename())) {
Buffer * master = checkAndLoadLyXFile(master_file, true); Buffer * master =
d->parent_buffer = master; checkAndLoadLyXFile(master_file, true);
// set master as master buffer, but only if we are
// a real child
if (master->isChild(this))
d->parent_buffer = master;
else
LYXERR0("The master '"
<< params().master
<< "' assigned to this document does not include "
"this document. Ignoring the master assignment.");
} }
} }

24
status.16x
View File

@ -24,7 +24,8 @@ What's new
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION
- Update localization of the user interface for Czech, German, and Italian. - Update localization of the user interface for Czech, German, and
Italian.
- Updated English and Spanish Customization manual. - Updated English and Spanish Customization manual.
@ -39,7 +40,8 @@ What's new
- New external material template for Dia. - New external material template for Dia.
- New layout file for submissions to ACM SIGGRAPH conferences and publications. - New layout file for submissions to ACM SIGGRAPH conferences and
publications.
- New layout file to typeset recipes. - New layout file to typeset recipes.
@ -77,6 +79,10 @@ What's new
- Fix crash when no file is open and the creation of a new document fails. - Fix crash when no file is open and the creation of a new document fails.
- Ignore the master_buffer setting in Document>Settings if the current
document is no real child. This fixes a crash when using the outliner
in such files (bug 5653).
- Speed up editing when the document contains paragraphs with many (>1000) - Speed up editing when the document contains paragraphs with many (>1000)
insets (bug 4443). insets (bug 4443).
@ -87,12 +93,12 @@ What's new
- Improve debug output when tracing what actions are triggered. - Improve debug output when tracing what actions are triggered.
- A re-declaration of an InsetLayout will now update the existing declaration - A re-declaration of an InsetLayout will now update the existing
rather than completely over-writing it---agreeing with the behavior of our declaration rather than completely over-writing it---agreeing with the
normal Style declarations. behavior of our normal Style declarations.
- Reflect external material template using Instant Preview in the dialog for - Reflect external material template using Instant Preview in the dialog
scaling property (bug 5628). for scaling property (bug 5628).
- Enable "dissolve" item in context menus of collapsable insets (bug 4985). - Enable "dissolve" item in context menus of collapsable insets (bug 4985).
@ -101,8 +107,8 @@ What's new
- Fix instant preview of external material for the first insert in the - Fix instant preview of external material for the first insert in the
document (bug 5626). document (bug 5626).
- Allow pasting of text from applications that set the clipboard mimetype to - Allow pasting of text from applications that set the clipboard mimetype
both graphics and text (bug 5560). to both graphics and text (bug 5560).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION