anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bugs 1844,1845: doc settings don't stick

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9751 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2005-03-27 13:31:04 +00:00
parent dbbcea2f5e
commit f6c4e1a9eb
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BranchList.h
View File

@ -74,6 +74,8 @@ public:
///
bool empty() { return list.empty(); }
///
void clear() { list.clear(); }
///
const_iterator begin() const { return list.begin(); }
const_iterator end() const { return list.end(); }

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2005-03-27 Martin Vermeer <martin.vermeer@hut.fi>
* buffer.[Ch]:
* BranchList.h: fix bugs 1844,1845: document settings don't
stick
2005-03-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxrc.C (setDefaults, read, output, getDescription): add support

15
src/buffer.C
View File

@ -13,6 +13,7 @@
#include "buffer.h"
#include "author.h"
#include "BranchList.h"
#include "buffer_funcs.h"
#include "bufferlist.h"
#include "bufferparams.h"
@ -395,6 +396,20 @@ int Buffer::readHeader(LyXLex & lex)
int line = -1;
int begin_header_line = -1;
// Initialize parameters that may be/go lacking in header:
params().branchlist().clear();
params().options.erase();
params().float_placement.erase();
params().paperwidth.erase();
params().paperheight.erase();
params().leftmargin.erase();
params().rightmargin.erase();
params().topmargin.erase();
params().bottommargin.erase();
params().headheight.erase();
params().headsep.erase();
params().footskip.erase();
while (lex.isOK()) {
lex.next();
string const token = lex.getString();