-2003-04-29 Alfredo Braunstein <abraunst@libero.it>
- * CutAndPaste.C (cutSelection): big rework, some bugs fixed
-
2003-04-29 André Pönitz <poenitz@gmx.net>
+ * paragraph.h: make operator= private unimplemented as long as
+ it is unusable
+
* ParagraphList.C: whitespace
* paragraph.[Ch]:
paragraph_pimpl.[Ch]:
paragraph_funcs.C:
- undo_funcs.C: Paragraph * -> Paragraph (const) &
+ CutAndPaste.C:
+ undo_funcs.C: whitespace + Paragraph * -> Paragraph (const) &
+
+ * text2.C:
+ undo_funcs.[Ch]: Paragraph * -> ParagraphList::iterator
+
+2003-04-29 Alfredo Braunstein <abraunst@libero.it>
+ * CutAndPaste.C (cutSelection): big rework, some bugs fixed
+
2003-04-28 John Levon <levon@movementarian.org>
* bufferlist.C: changes for unsaved changes dialog
MathInset::mode_type asMode(MathInset::mode_type oldmode, string const & str)
{
- lyxerr << "handling mode: '" << str << "'\n";
+ //lyxerr << "handling mode: '" << str << "'\n";
if (str == "mathmode")
return MathInset::MATH_MODE;
if (str == "textmode" || str == "forcetext")
friend struct Paragraph::Pimpl;
///
Pimpl * pimpl_;
+
+ /// unimplemented
+ void operator=(Paragraph const &);
};
new Paragraph);
tmp->makeSameLayout(*par);
- // When can pos > Last()?
- // I guess pos == Last() is possible.
+ // When can pos > size()?
+ // I guess pos == size() is possible.
if (par->size() > pos) {
// copy everything behind the break-position to the new
// paragraph
lyxerr[Debug::LATEX] << "TeXDeeper... " << &*pit << endl;
ParagraphList::iterator par = pit;
- while (par != paragraphs.end()&& par->params().depth() == pit->params().depth()) {
+ while (par != paragraphs.end() &&
+ par->params().depth() == pit->params().depth()) {
if (par->layout()->isEnvironment()) {
par = TeXEnvironment(buf, paragraphs, par,
os, texrow);
}
if (pit->params().lineTop()) {
- os << "\\lyxline{\\" << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize() << '}'
+ os << "\\lyxline{\\"
+ << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize()
+ << '}'
<< "\\vspace{-1\\parskip}";
further_blank_line = true;
}
++endpit;
}
- setUndo(bv(), Undo::EDIT, &*sstart_cur.par(), &*undoendpit);
+ setUndo(bv(), Undo::EDIT, sstart_cur.par(), undoendpit);
// ok we have a selection. This is always between sstart_cur
// and sel_end cursor
ParagraphList::iterator pastend = boost::next(end);
if (!test_only)
- setUndo(bv(), Undo::EDIT, &(*start), &(*pastend));
+ setUndo(bv(), Undo::EDIT, start, pastend);
bool changed = false;
// and sel_end cursor
setUndo(bv(), Undo::EDIT,
- &*selection.start.par(), &*boost::next(selection.end.par()));
+ selection.start.par(), boost::next(selection.end.par()));
freezeUndo();
cursor = selection.start;
while (cursor.par() != selection.end.par() ||
++endpit;
}
- setUndo(bv(), Undo::EDIT, &*selection.start.par(), &*undoendpit);
+ setUndo(bv(), Undo::EDIT, selection.start.par(), undoendpit);
ParagraphList::iterator tmppit = selection.end.par();
{
if (!cursor.par()->insetAllowed(inset->lyxCode()))
return;
- setUndo(bv(), Undo::FINISH, &*cursor.par(),
- &*boost::next(cursor.par()));
+ setUndo(bv(), Undo::FINISH, cursor.par(),
+ boost::next(cursor.par()));
freezeUndo();
cursor.par()->insertInset(cursor.pos(), inset);
// Just to rebreak and refresh correctly.
++endpit;
}
- setUndo(bv(), Undo::DELETE, &*selection.start.par(), &*undoendpit);
+ setUndo(bv(), Undo::DELETE, selection.start.par(), undoendpit);
endpit = selection.end.par();
return;
setUndo(bv(), Undo::INSERT,
- &*cursor.par(), &*boost::next(cursor.par()));
+ cursor.par(), boost::next(cursor.par()));
Paragraph * endpar;
ParagraphList::iterator actpit = cursor.par();
++endpit;
}
- setUndo(bv(), Undo::DELETE, &*old_cursor.par(), &*endpit);
+ setUndo(bv(), Undo::DELETE, old_cursor.par(), endpit);
cursor = tmpcursor;
// delete old row
++endpit;
}
- setUndo(bv(), Undo::DELETE, &*old_cursor.par(), &*endpit);
+ setUndo(bv(), Undo::DELETE, old_cursor.par(), endpit);
cursor = tmpcursor;
// delete old row
{
Buffer * b = bv->buffer();
- Paragraph * before =
- &*b->getParFromID(undo.number_of_before_par);
- Paragraph * behind =
- &*b->getParFromID(undo.number_of_behind_par);
+ Paragraph * before = &*b->getParFromID(undo.number_of_before_par);
+ Paragraph * behind = &*b->getParFromID(undo.number_of_behind_par);
Paragraph * tmppar;
Paragraph * tmppar2;
bool createUndo(BufferView * bv, Undo::undo_kind kind,
- Paragraph const * first, Paragraph const * behind, shared_ptr<Undo> & u)
+ ParagraphList::iterator itfirst, ParagraphList::iterator itbehind,
+ shared_ptr<Undo> & u)
{
+ Paragraph * first = &*itfirst;
+ Paragraph * behind = &*itbehind;
lyx::Assert(first);
int before_number = -1;
void setUndo(BufferView * bv, Undo::undo_kind kind,
- Paragraph const * first, Paragraph const * behind)
+ ParagraphList::iterator first, ParagraphList::iterator behind)
{
if (!undo_frozen) {
shared_ptr<Undo> u;
- if (createUndo(bv, kind, first, behind, u))
+ if (createUndo(bv, kind, &*first, &*behind, u))
bv->buffer()->undostack.push(u);
bv->buffer()->redostack.clear();
}
void setRedo(BufferView * bv, Undo::undo_kind kind,
- Paragraph const * first, Paragraph const * behind)
+ ParagraphList::iterator first, ParagraphList::iterator behind)
{
shared_ptr<Undo> u;
- if (createUndo(bv, kind, first, behind, u))
+ if (createUndo(bv, kind, &*first, &*behind, u))
bv->buffer()->redostack.push(u);
}
#define UNDO_FUNCS_H
#include "undo.h"
+#include "ParagraphList.h"
class BufferView;
class Paragraph;
extern void unFreezeUndo();
/// FIXME
extern void setUndo(BufferView *, Undo::undo_kind kind,
- Paragraph const * first, Paragraph const * behind);
+ ParagraphList::iterator first, ParagraphList::iterator behind);
/// FIXME
extern void setRedo(BufferView *, Undo::undo_kind kind,
- Paragraph const * first, Paragraph const * behind);
+ ParagraphList::iterator first, ParagraphList::iterator behind);
/// FIXME
extern void setCursorParUndo(BufferView *);