anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 05:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/paragraph_funcs.C: remove FIXMEs for change tracking

Browse Source 
(everything was fine); output lyxerr debug message


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16060 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-11-26 13:35:11 +00:00
parent e3f01ff2f0
commit 9095690af0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/paragraph_funcs.C
View File

@ -15,11 +15,13 @@
#include "bufferparams.h" #include "bufferparams.h"
#include "lyxtext.h" #include "lyxtext.h"
#include "paragraph_pimpl.h" #include "paragraph_pimpl.h"
#include "debug.h"
namespace lyx { namespace lyx {
using std::string; using std::string;
using std::endl;
static bool moveItem(Paragraph & fromPar, pos_type fromPos, static bool moveItem(Paragraph & fromPar, pos_type fromPos,
@ -185,22 +187,25 @@ void mergeParagraph(BufferParams const & bparams,
pos_type pos_end = next.size() - 1; pos_type pos_end = next.size() - 1;
pos_type pos_insert = par.size(); pos_type pos_insert = par.size();
// The imaginary end-of-paragraph character (at par.size()) has to be // the imaginary end-of-paragraph character (at par.size()) has to be
// marked as unmodified. Otherwise, its change is adopted by the first // marked as unmodified. Otherwise, its change is adopted by the first
// character of the next paragraph. // character of the next paragraph.
if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
// FIXME: change tracking (MG) lyxerr[Debug::CHANGES] <<
par.setChange(par.size(), Change(Change::UNCHANGED)); "merging par with inserted/deleted end-of-par character" << endl;
par.setChange(par.size(), Change(Change::UNCHANGED));
}
Change change = next.lookupChange(next.size()); Change change = next.lookupChange(next.size());
// ok, now copy the paragraph
// move the content of the second paragraph to the end of the first one
for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) { for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) {
if (moveItem(next, 0, par, j, bparams)) { if (moveItem(next, 0, par, j, bparams)) {
++j; ++j;
} }
} }
// Move the change of the end-of-paragraph character
// FIXME: change tracking (MG) // move the change of the end-of-paragraph character
par.setChange(par.size(), change); par.setChange(par.size(), change);
pars.erase(boost::next(pars.begin(), par_offset + 1)); pars.erase(boost::next(pars.begin(), par_offset + 1));