diff --git a/src/insets/inset.h b/src/insets/inset.h index dc1f49782f..e2a01478d6 100644 --- a/src/insets/inset.h +++ b/src/insets/inset.h @@ -234,7 +234,7 @@ public: /// void parOwner(Paragraph * par) { par_owner_ = par; } /// - Paragraph * parOwner() const {return par_owner_; } + Paragraph * parOwner() const { return par_owner_; } /// void setBackgroundColor(LColor::color); /// @@ -262,19 +262,12 @@ public: /// try to get a inset pointer from it's id if we have /// an inset to give back! - virtual Inset * getInsetFromID(int /* id */) const { - return 0; - } + virtual Inset * getInsetFromID(int /*id*/) const { return 0; } /// if this insets owns paragraphs (f.ex. InsetText) then it /// should return it's very first one! - virtual Paragraph * firstParagraph() const { - return 0; - } - + virtual Paragraph * firstParagraph() const { return 0; } /// - virtual Paragraph * getFirstParagraph(int /*num*/) const { - return 0; - } + virtual Paragraph * getFirstParagraph(int /*num*/) const { return 0; } /// return the cursor if we own one otherwise giv'em just the /// BufferView cursor to work with. @@ -495,9 +488,7 @@ public: /// virtual void selectSelectedWord(BufferView *) {} /// - virtual void toggleSelection(BufferView *, bool /*kill_selection*/) { - return; - } + virtual void toggleSelection(BufferView *, bool /*kill_selection*/) {} /// find the next change in the inset virtual bool nextChange(BufferView * bv, lyx::pos_type & length); diff --git a/src/insets/insettext.C b/src/insets/insettext.C index d445cff169..b251d181eb 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -104,6 +104,7 @@ void InsetText::saveLyXTextState(LyXText * t) const } } + void InsetText::restoreLyXTextState(BufferView * bv, LyXText * t) const { if (sstate.lpar) { @@ -2533,9 +2534,9 @@ Paragraph * InsetText::getFirstParagraph(int i) const LyXCursor const & InsetText::cursor(BufferView * bv) const { - if (the_locking_inset) - return the_locking_inset->cursor(bv); - return getLyXText(bv)->cursor; + if (the_locking_inset) + return the_locking_inset->cursor(bv); + return getLyXText(bv)->cursor; } diff --git a/src/mathed/formula.C b/src/mathed/formula.C index b586aea753..f903814baa 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -261,7 +261,7 @@ void InsetFormula::validate(LaTeXFeatures & features) const bool InsetFormula::insetAllowed(Inset::Code code) const { return - (code == Inset::LABEL_CODE) + code == Inset::LABEL_CODE || code == Inset::REF_CODE || code == Inset::ERT_CODE; } @@ -330,3 +330,4 @@ string const InsetFormula::PreviewImpl::latexString() const parent().par_->write(wi); return STRCONV(ls.str()); } +