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

some inset fixes + other fixes for warnings from cxx

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1046 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-09-27 13:52:39 +00:00
parent 52d76611c3
commit d0655188bc
10 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2000-09-27 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/Bullet.h: changed type of font, character and size to int
* src/buffer.C (asciiParagraph): remove actcell and fname1.
* src/insets/inseturl.[Ch]:
* src/insets/insetref.[Ch]:
* src/insets/insetlabel.[Ch]: add linelen to Ascii
2000-09-26 Angus Leeming <a.leeming@ic.ac.uk> 2000-09-26 Angus Leeming <a.leeming@ic.ac.uk>
* src/buffer.C (readFile): block-if statement rearranged to minimise * src/buffer.C (readFile): block-if statement rearranged to minimise

6
src/Bullet.h
View File

@ -106,11 +106,11 @@ private:
static string const bulletEntry(short int, short int); static string const bulletEntry(short int, short int);
/// ///
short font; int font;
/// ///
short character; int character;
/// ///
short size; int size;
// size, character and font are array indices to access // size, character and font are array indices to access
// the predefined arrays of LaTeX equivalent strings. // the predefined arrays of LaTeX equivalent strings.

4
src/buffer.C
View File

@ -1472,12 +1472,9 @@ string const Buffer::asciiParagraph(LyXParagraph const * par, int linelen) const
int j; int j;
int ltype = 0; int ltype = 0;
int ltype_depth = 0; int ltype_depth = 0;
int actcell = 0;
int currlinelen = 0; int currlinelen = 0;
bool ref_printed = false; bool ref_printed = false;
string fname1 = TmpFileName();
int noparbreak = 0; int noparbreak = 0;
int islatex = 0; int islatex = 0;
if ( if (
@ -1573,7 +1570,6 @@ string const Buffer::asciiParagraph(LyXParagraph const * par, int linelen) const
} }
font1 = LyXFont(LyXFont::ALL_INHERIT, params.language_info); font1 = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
actcell = 0;
for (i = 0; i < par->size(); ++i) { for (i = 0; i < par->size(); ++i) {
if (!i && !footnoteflag && !noparbreak){ if (!i && !footnoteflag && !noparbreak){
buffer << "\n\n"; buffer << "\n\n";

2
src/insets/insetlabel.C
View File

@ -73,7 +73,7 @@ int InsetLabel::Latex(Buffer const *, ostream & os,
return 0; return 0;
} }
int InsetLabel::Ascii(Buffer const *, ostream & os) const int InsetLabel::Ascii(Buffer const *, ostream & os, int linelen) const
{ {
os << "<" << getContents() << ">"; os << "<" << getContents() << ">";
return 0; return 0;

2
src/insets/insetlabel.h
View File

@ -38,7 +38,7 @@ public:
int Latex(Buffer const *, std::ostream &, int Latex(Buffer const *, std::ostream &,
bool fragile, bool free_spc) const; bool fragile, bool free_spc) const;
/// ///
int Ascii(Buffer const *, std::ostream &) const; int Ascii(Buffer const *, std::ostream &, int linelen) const;
/// ///
int Linuxdoc(Buffer const *, std::ostream &) const; int Linuxdoc(Buffer const *, std::ostream &) const;
/// ///

2
src/insets/insetref.C
View File

@ -72,7 +72,7 @@ int InsetRef::Latex(Buffer const *, ostream & os,
} }
int InsetRef::Ascii(Buffer const *, ostream & os) const int InsetRef::Ascii(Buffer const *, ostream & os, int linelen) const
{ {
os << "[" << getContents() << "]"; os << "[" << getContents() << "]";
return 0; return 0;

2
src/insets/insetref.h
View File

@ -41,7 +41,7 @@ public:
int Latex(Buffer const *, std::ostream &, int Latex(Buffer const *, std::ostream &,
bool fragile, bool free_spc) const; bool fragile, bool free_spc) const;
/// ///
int Ascii(Buffer const *, std::ostream &) const; int Ascii(Buffer const *, std::ostream &, int linelen) const;
/// ///
int Linuxdoc(Buffer const *, std::ostream &) const; int Linuxdoc(Buffer const *, std::ostream &) const;
/// ///

2
src/insets/inseturl.C
View File

@ -54,7 +54,7 @@ int InsetUrl::Latex(Buffer const *, ostream & os,
} }
int InsetUrl::Ascii(Buffer const *, ostream & os) const int InsetUrl::Ascii(Buffer const *, ostream & os, int linelen) const
{ {
if (getOptions().empty()) if (getOptions().empty())
os << "[" << getContents() << "]"; os << "[" << getContents() << "]";

2
src/insets/inseturl.h
View File

@ -44,7 +44,7 @@ public:
int Latex(Buffer const *, std::ostream &, int Latex(Buffer const *, std::ostream &,
bool fragile, bool free_spc) const; bool fragile, bool free_spc) const;
/// ///
int Ascii(Buffer const *, std::ostream &) const; int Ascii(Buffer const *, std::ostream &, int linelen) const;
/// ///
int Linuxdoc(Buffer const *, std::ostream &) const; int Linuxdoc(Buffer const *, std::ostream &) const;
/// ///

3
src/insets/lyxinset.h
View File

@ -171,7 +171,8 @@ public:
virtual int Latex(Buffer const *, std::ostream &, bool fragile, virtual int Latex(Buffer const *, std::ostream &, bool fragile,
bool free_spc) const = 0; bool free_spc) const = 0;
/// ///
virtual int Ascii(Buffer const *, std::ostream &, int linelen=0) const = 0; virtual int Ascii(Buffer const *,
std::ostream &, int linelen = 0) const = 0;
/// ///
virtual int Linuxdoc(Buffer const *, std::ostream &) const = 0; virtual int Linuxdoc(Buffer const *, std::ostream &) const = 0;
/// ///