Work-around for bug #6034: Applying preferences confuses window about its size.

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index cb628992a719d4b73d80a50e976c77126dc48af9..dfc895d1f1285e2da7111f4c1230c617f0b9c6a4 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -191,7 +191,7 @@ void mergeParagraph(BufferParams const & bparams,
        // the imaginary end-of-paragraph character (at par.size()) has to be
        // marked as unmodified. Otherwise, its change is adopted by the first
        // character of the next paragraph.
-       if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
+       if (par.isChanged(par.size())) {
                LYXERR(Debug::CHANGES,
                   "merging par with inserted/deleted end-of-par character");
                par.setChange(par.size(), Change(Change::UNCHANGED));
@@ -338,7 +338,7 @@ bool isFullyDeleted(ParagraphList const & pars)
        // check all paragraphs
        for (pit_type pit = 0; pit < pars_size; ++pit) {
                if (!pars[pit].empty())   // prevent assertion failure
-                       if (!pars[pit].isFullyDeleted(0, pars[pit].size()))
+                       if (!pars[pit].isDeleted(0, pars[pit].size()))
                                return false;
        }
        return true;