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

remove some compability code

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6314 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-03-02 12:48:45 +00:00
parent 1583baeb34
commit aaa02999f2
5 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,6 +1,13 @@
2003-03-02 Lars Gullik Bjønnes <larsbj@gullik.net>
* buffer.C (readInset): remove compability code for old Figure and
InsetInfo insets
2003-03-02 Lars Gullik Bjønnes <larsbj@gullik.net>
* buffer.C: ws changes
(readInset):
* BufferView_pimpl.C: ditto
* author.C: ditto
* buffer.h: ditto

12
src/buffer.C
View File

@ -1135,7 +1135,6 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
inset = new InsetParent(inscmd, *this);
}
} else {
bool alreadyread = false;
if (tmptok == "Quotes") {
inset = new InsetQuotes;
} else if (tmptok == "External") {
@ -1144,16 +1143,8 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
inset = new InsetFormulaMacro;
} else if (tmptok == "Formula") {
inset = new InsetFormula;
} else if (tmptok == "Figure") { // Backward compatibility
// inset = new InsetFig(100, 100, *this);
inset = new InsetGraphics;
} else if (tmptok == "Graphics") {
inset = new InsetGraphics;
} else if (tmptok == "Info") {// backwards compatibility
inset = new InsetNote(this,
lex.getLongString("\\end_inset"),
true);
alreadyread = true;
} else if (tmptok == "Note") {
inset = new InsetNote(params);
} else if (tmptok == "Include") {
@ -1193,7 +1184,8 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
inset = new InsetFloatList;
}
if (inset && !alreadyread) inset->read(this, lex);
if (inset)
inset->read(this, lex);
}
if (inset) {

16
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2003-03-02 Lars Gullik Bjønnes <larsbj@gullik.net>
* insetnote.[Ch] (InsetNote): remove unused constructor
2003-02-28 Alfredo Braunstein <abraunst@libero.it>
* insetgraphics.C: added include "format.h"
@ -45,7 +49,7 @@
2003-02-26 Alfredo Braunstein <abraunst@libero.it>
* insetgraphics.C (draw)
* insetinclude.C (draw): Eliminate also the other argument (owner
* insetinclude.C (draw): Eliminate also the other argument (owner
inset inset) in the call to PreviewImage::image
2003-02-25 Alfredo Braunstein <abraunst@libero.it>
@ -92,7 +96,7 @@
* Makefile.am: add new files.
2003-02-21 Angus Leeming <leeming@lyx.org>
* updatableinset.h (setView, view): remove.
* inset.h (view, cache): to be replaced by these.
@ -110,7 +114,7 @@
child document is under version control.
2003-02-17 André Pönitz <poenitz@gmx.net>
* insetbib.[Ch]: Adjust access to bibkeys
2003-02-14 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
@ -164,7 +168,7 @@
2003-01-12 Michael Schmitt <michael.schmitt@teststep.org>
* insetgraphics.C (draw, width): Fix spacing around graphics inset
* insetgraphics.C (draw, width): Fix spacing around graphics inset
2002-12-17 Juergen Vigna <jug@lyx.org>
@ -185,8 +189,8 @@
2002-12-17 Alfredo Braunstein <abraunst@libero.it>
* insettext.C (lfunMouseRelease): hackish solution to the "double
menu open" bug
* insettext.C (lfunMouseRelease): hackish solution to the "double
menu open" bug
2002-12-08 Lars Gullik Bjønnes <larsbj@gullik.net>

20
src/insets/insetnote.C
View File

@ -59,26 +59,6 @@ Inset * InsetNote::clone(Buffer const &, bool same_id) const
}
// This constructor is used for reading old InsetInfo
InsetNote::InsetNote(Buffer const * buf, string const & contents,
bool collapsed)
: InsetCollapsable(buf->params, collapsed)
{
init();
Paragraph * par = inset.paragraph();
LyXFont font(LyXFont::ALL_INHERIT, buf->params.language);
// Since XForms doesn't support RTL, we can assume that old notes
// in RTL documents are written in English.
if (font.language()->RightToLeft())
font.setLanguage(default_language);
lyx::pos_type pos = 0;
buf->insertStringAsLines(par, pos, font, rtrim(contents, "\n"));
}
string const InsetNote::editMessage() const
{
return _("Opened Note Inset");

2
src/insets/insetnote.h
View File

@ -26,8 +26,6 @@ public:
InsetNote(InsetNote const &, bool same_id = false);
///
Inset * clone(Buffer const &, bool same_id = false) const;
/// constructor with initial contents
InsetNote(Buffer const *, string const & contents, bool collapsed);
///
string const editMessage() const;
///