anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6878 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-04-29 10:39:08 +00:00
parent 76d84c61fd
commit 263b9fc043
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -6,6 +6,10 @@
* ParagraphList.C: whitespace
* paragraph.[Ch]:
paragraph_pimpl.[Ch]:
undo_funcs.C: Paragraph * -> Paragraph (const) &
2003-04-28 John Levon <levon@movementarian.org>
* bufferlist.C: changes for unsaved changes dialog

2
src/paragraph.C
View File

@ -1303,7 +1303,7 @@ void Paragraph::resizeInsetsLyXText(BufferView * bv)
}
void Paragraph::setContentsFromPar(Paragraph * par)
void Paragraph::setContentsFromPar(Paragraph const & par)
{
pimpl_->setContentsFromPar(par);
}

2
src/paragraph.h
View File

@ -125,7 +125,7 @@ public:
///
bool empty() const;
///
void setContentsFromPar(Paragraph * par);
void setContentsFromPar(Paragraph const & par);
///
void clearContents();

9
src/paragraph_pimpl.C
View File

@ -84,12 +84,11 @@ void Paragraph::Pimpl::clear()
}
void Paragraph::Pimpl::setContentsFromPar(Paragraph const * par)
void Paragraph::Pimpl::setContentsFromPar(Paragraph const & par)
{
lyx::Assert(par);
text = par->pimpl_->text;
if (par->pimpl_->tracking()) {
changes_.reset(new Changes(*(par->pimpl_->changes_.get())));
text = par.pimpl_->text;
if (par.pimpl_->tracking()) {
changes_.reset(new Changes(*(par.pimpl_->changes_.get())));
}
}

2
src/paragraph_pimpl.h
View File

@ -36,7 +36,7 @@ struct Paragraph::Pimpl {
///
void clear();
///
void setContentsFromPar(Paragraph const * par);
void setContentsFromPar(Paragraph const & par);
/// set tracking mode
void trackChanges(Change::Type type = Change::UNCHANGED);
/// stop tracking

2
src/undo_funcs.C
View File

@ -145,7 +145,7 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
// is stored in the undo. So restore
// the text informations.
if (undo.kind == Undo::EDIT) {
tmppar2->setContentsFromPar(tmppar);
tmppar2->setContentsFromPar(*tmppar);
tmppar2 = tmppar2->next();
}
}