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

merge InsetText::setParagraphData and InsetText::init

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7506 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-08-05 11:54:44 +00:00
parent 82910986f7
commit 2faeeb8b96
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/insets/insettext.C
View File

@ -154,7 +154,16 @@ void InsetText::init(InsetText const * ins)
if (ins) { if (ins) {
textwidth_ = ins->textwidth_; textwidth_ = ins->textwidth_;
text_.bv_owner = ins->text_.bv_owner; text_.bv_owner = ins->text_.bv_owner;
setParagraphData(ins->paragraphs);
paragraphs = ins->paragraphs;
ParagraphList::iterator pit = paragraphs.begin();
ParagraphList::iterator end = paragraphs.end();
for (; pit != end; ++pit)
pit->setInsetOwner(this);
reinitLyXText();
autoBreakRows = ins->autoBreakRows; autoBreakRows = ins->autoBreakRows;
drawFrame_ = ins->drawFrame_; drawFrame_ = ins->drawFrame_;
frame_color = ins->frame_color; frame_color = ins->frame_color;
@ -1588,32 +1597,11 @@ bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
} }
void InsetText::setParagraphData(ParagraphList const & plist)
{
// we have to unlock any locked inset otherwise we're in troubles
the_locking_inset = 0;
// But it it makes no difference that is a lot better.
#warning FIXME.
// See if this can be simplified when std::list is in effect.
paragraphs.clear();
ParagraphList::const_iterator it = plist.begin();
ParagraphList::const_iterator end = plist.end();
for (; it != end; ++it) {
paragraphs.push_back(*it);
paragraphs.back().setInsetOwner(this);
}
reinitLyXText();
}
void InsetText::markNew(bool track_changes) void InsetText::markNew(bool track_changes)
{ {
ParagraphList::iterator pit = paragraphs.begin(); ParagraphList::iterator pit = paragraphs.begin();
ParagraphList::iterator pend = paragraphs.end(); ParagraphList::iterator end = paragraphs.end();
for (; pit != pend; ++pit) { for (; pit != end; ++pit) {
if (track_changes) { if (track_changes) {
pit->trackChanges(); pit->trackChanges();
} else { } else {
@ -1774,7 +1762,9 @@ void InsetText::resizeLyXText(BufferView * bv, bool /*force*/) const
inset_x = cix() - top_x + drawTextXOffset; inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset; inset_y = ciy() + drawTextYOffset;
} }
#endif
#if 1
text_.top_y(bv->screen().topCursorVisible(&text_)); text_.top_y(bv->screen().topCursorVisible(&text_));
if (!owner()) { if (!owner()) {
const_cast<InsetText*>(this)->updateLocal(bv, false); const_cast<InsetText*>(this)->updateLocal(bv, false);

2
src/insets/insettext.h
View File

@ -123,8 +123,6 @@ public:
/// ///
void writeParagraphData(Buffer const *, std::ostream &) const; void writeParagraphData(Buffer const *, std::ostream &) const;
/// ///
void setParagraphData(ParagraphList const &);
///
void setText(string const &, LyXFont const &); void setText(string const &, LyXFont const &);
/// ///
void setAutoBreakRows(bool); void setAutoBreakRows(bool);