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

some ws

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6202 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-02-18 16:58:16 +00:00
parent 5931d72922
commit fdaf203c12
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/insets/inset.h
View File

@ -234,7 +234,7 @@ public:
/// ///
void parOwner(Paragraph * par) { par_owner_ = par; } void parOwner(Paragraph * par) { par_owner_ = par; }
/// ///
Paragraph * parOwner() const {return par_owner_; } Paragraph * parOwner() const { return par_owner_; }
/// ///
void setBackgroundColor(LColor::color); void setBackgroundColor(LColor::color);
/// ///
@ -262,19 +262,12 @@ public:
/// try to get a inset pointer from it's id if we have /// try to get a inset pointer from it's id if we have
/// an inset to give back! /// an inset to give back!
virtual Inset * getInsetFromID(int /* id */) const { virtual Inset * getInsetFromID(int /*id*/) const { return 0; }
return 0;
}
/// if this insets owns paragraphs (f.ex. InsetText) then it /// if this insets owns paragraphs (f.ex. InsetText) then it
/// should return it's very first one! /// should return it's very first one!
virtual Paragraph * firstParagraph() const { virtual Paragraph * firstParagraph() const { return 0; }
return 0;
}
/// ///
virtual Paragraph * getFirstParagraph(int /*num*/) const { virtual Paragraph * getFirstParagraph(int /*num*/) const { return 0; }
return 0;
}
/// return the cursor if we own one otherwise giv'em just the /// return the cursor if we own one otherwise giv'em just the
/// BufferView cursor to work with. /// BufferView cursor to work with.
@ -495,9 +488,7 @@ public:
/// ///
virtual void selectSelectedWord(BufferView *) {} virtual void selectSelectedWord(BufferView *) {}
/// ///
virtual void toggleSelection(BufferView *, bool /*kill_selection*/) { virtual void toggleSelection(BufferView *, bool /*kill_selection*/) {}
return;
}
/// find the next change in the inset /// find the next change in the inset
virtual bool nextChange(BufferView * bv, lyx::pos_type & length); virtual bool nextChange(BufferView * bv, lyx::pos_type & length);

7
src/insets/insettext.C
View File

@ -104,6 +104,7 @@ void InsetText::saveLyXTextState(LyXText * t) const
} }
} }
void InsetText::restoreLyXTextState(BufferView * bv, LyXText * t) const void InsetText::restoreLyXTextState(BufferView * bv, LyXText * t) const
{ {
if (sstate.lpar) { if (sstate.lpar) {
@ -2533,9 +2534,9 @@ Paragraph * InsetText::getFirstParagraph(int i) const
LyXCursor const & InsetText::cursor(BufferView * bv) const LyXCursor const & InsetText::cursor(BufferView * bv) const
{ {
if (the_locking_inset) if (the_locking_inset)
return the_locking_inset->cursor(bv); return the_locking_inset->cursor(bv);
return getLyXText(bv)->cursor; return getLyXText(bv)->cursor;
} }

3
src/mathed/formula.C
View File

@ -261,7 +261,7 @@ void InsetFormula::validate(LaTeXFeatures & features) const
bool InsetFormula::insetAllowed(Inset::Code code) const bool InsetFormula::insetAllowed(Inset::Code code) const
{ {
return return
(code == Inset::LABEL_CODE) code == Inset::LABEL_CODE
|| code == Inset::REF_CODE || code == Inset::REF_CODE
|| code == Inset::ERT_CODE; || code == Inset::ERT_CODE;
} }
@ -330,3 +330,4 @@ string const InsetFormula::PreviewImpl::latexString() const
parent().par_->write(wi); parent().par_->write(wi);
return STRCONV(ls.str()); return STRCONV(ls.str());
} }