anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small compilation fixes for compaq cxx; updated ca.po

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@574 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-02-25 16:42:21 +00:00
parent 2be7e39279
commit 371d623527
10 changed files with 758 additions and 1065 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2000-02-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/insets/insettext.C (LocalDispatch): remove extra break
statement.
* src/insets/insetert.[Ch] (Clone): change return value to Inset*
* src/insets/insettext.[Ch] (Clone): change return value to Inset*
* src/mathed/formulamacro.[Ch] (draw): add missing const qualifier
* src/insets/insettext.[Ch] (GetCursorPos): ditto
* src/insets/insetbib.h: move InsetBibkey::Holder and
InsetCitation::Holder in public space.
2000-02-25 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/insets/insettext.h: small change to get the new files from

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2000-02-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ca.po: updated from Francesc Burrull i Mestres
2000-02-08 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* he.po: new file from tzafrir Cohen <tzafrir@technion.ac.il>.

1778
po/ca.po
View File

File diff suppressed because it is too large Load Diff

10
src/insets/insetbib.h
View File

@ -42,13 +42,13 @@ public:
unsigned char Editable() const {
return 1;
}
private:
///
struct Holder {
InsetCitation * inset;
BufferView * view;
};
private:
///
Holder holder;
};
@ -89,16 +89,16 @@ public:
void setCounter(int);
///
int getCounter() const { return counter; }
private:
///
int counter;
///
struct Holder {
InsetBibKey * inset;
BufferView * view;
};
private:
///
int counter;
///
Holder holder;
};

2
src/insets/insetert.C
View File

@ -28,7 +28,7 @@ InsetERT::InsetERT(Buffer * bf)
}
InsetERT * InsetERT::Clone() const
Inset * InsetERT::Clone() const
{
InsetERT * result = new InsetERT(buffer);
return result;

2
src/insets/insetert.h
View File

@ -36,7 +36,7 @@ public:
///
~InsetERT() {}
///
InsetERT * Clone() const;
Inset * Clone() const;
///
// void Read(LyXLex &);
///

5
src/insets/insettext.C
View File

@ -86,7 +86,7 @@ InsetText::~InsetText()
}
InsetText * InsetText::Clone() const
Inset * InsetText::Clone() const
{
InsetText * t = new InsetText(*this, buffer);
return t;
@ -813,7 +813,6 @@ UpdatableInset::RESULT InsetText::LocalDispatch(BufferView * bv,
selection_start = selection_end = actpos;
}
return DISPATCHED;
break;
default:
result = UNDISPATCHED;
break;
@ -978,7 +977,7 @@ int InsetText::BeginningOfMainBody(LyXParagraph * par) const
}
void InsetText::GetCursorPos(int & x, int & y)
void InsetText::GetCursorPos(int & x, int & y) const
{
x = cx;
y = cy;

4
src/insets/insettext.h
View File

@ -42,7 +42,7 @@ public:
///
~InsetText();
///
InsetText * Clone() const;
Inset * Clone() const;
///
void Read(LyXLex &);
///
@ -92,7 +92,7 @@ public:
///
Inset::Code LyxCode() const { return Inset::TEXT_CODE; }
///
void GetCursorPos(int & x, int & y);
void GetCursorPos(int & x, int & y) const;
///
int InsetInInsetY();
///

2
src/mathed/formulamacro.C
View File

@ -146,7 +146,7 @@ int InsetFormulaMacro::width(Painter & pain, LyXFont const & f) const
void InsetFormulaMacro::draw(Painter & pain, LyXFont const & f,
int baseline, float & x)
int baseline, float & x) const
{
LyXFont font(f);
tmacro->update();

2
src/mathed/formulamacro.h
View File

@ -42,7 +42,7 @@ public:
///
int width(Painter &, LyXFont const &) const;
///
void draw(Painter &, LyXFont const &, int baseline, float & x);
void draw(Painter &, LyXFont const &, int baseline, float & x) const;
///
void Read(LyXLex & lex);
///