X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=a6d61e6000797c2557667c0dd8559df0ca8f6816;hb=7af6575cf6cd764b8b567b358907ac9a7a8e322b;hp=afa53f6850516963380627367f167e27bb2e3552;hpb=21567a260c21daee7ef2c8e83611dd11411193b9;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index afa53f6850..a6d61e6000 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -516,7 +516,7 @@ public:
 
 
 Paragraph::Private::Private(Paragraph * owner, Layout const & layout)
-	: owner_(owner), inset_owner_(0), id_(-1), begin_of_body_(0), layout_(&layout)
+	: owner_(owner), inset_owner_(nullptr), id_(-1), begin_of_body_(0), layout_(&layout)
 {
 	text_.reserve(100);
 }
@@ -604,7 +604,7 @@ bool Paragraph::hasChangedInsets(pos_type start, pos_type end) const
 	LASSERT(start >= 0 && start <= size(), return false);
 	LASSERT(end > start && end <= size() + 1, return false);
 
-	for (auto const icit : d->insetlist_) {
+	for (auto const & icit : d->insetlist_) {
 		if (icit.pos < start)
 			continue;
 		if (icit.pos >= end)
@@ -1764,7 +1764,7 @@ Font const & Paragraph::getFontSettings(BufferParams const & bparams,
 	// Optimisation: avoid a full font instantiation if there is no
 	// language change from previous call.
 	static Font previous_font;
-	static Language const * previous_lang = 0;
+	static Language const * previous_lang = nullptr;
 	Language const * lang = getParLanguage(bparams);
 	if (lang != previous_lang) {
 		previous_lang = lang;
@@ -1812,7 +1812,7 @@ Font const & Paragraph::getFirstFontSettings(BufferParams const & bparams) const
 	// Optimisation: avoid a full font instantiation if there is no
 	// language change from previous call.
 	static Font previous_font;
-	static Language const * previous_lang = 0;
+	static Language const * previous_lang = nullptr;
 	if (bparams.language != previous_lang) {
 		previous_lang = bparams.language;
 		previous_font = Font(inherit_font, bparams.language);
@@ -2122,15 +2122,17 @@ void Paragraph::setBeginOfBody()
 	// remove unnecessary getChar() calls
 	pos_type i = 0;
 	pos_type end = size();
-	if (i < end && !(isNewline(i) || isEnvSeparator(i))) {
+	bool prev_char_deleted = false;
+	if (i < end && (!(isNewline(i) || isEnvSeparator(i)) || isDeleted(i))) {
 		++i;
 		if (i < end) {
 			char_type previous_char = d->text_[i];
 			if (!(isNewline(i) || isEnvSeparator(i))) {
 				++i;
-				while (i < end && previous_char != ' ') {
+				while (i < end && (previous_char != ' ' || prev_char_deleted)) {
 					char_type temp = d->text_[i];
-					if (isNewline(i) || isEnvSeparator(i))
+					prev_char_deleted = isDeleted(i);
+					if (!isDeleted(i) && (isNewline(i) || isEnvSeparator(i)))
 						break;
 					++i;
 					previous_char = temp;
@@ -2717,7 +2719,7 @@ void Paragraph::latex(BufferParams const & bparams,
 				Inset const * inset = getInset(i);
 				InsetText const * textinset = inset
 							? inset->asInsetText()
-							: 0;
+							: nullptr;
 				if (i + 1 == size() && textinset
 				    && !inset->getLayout().isDisplay()) {
 					ParagraphList const & pars =
@@ -3636,7 +3638,7 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options, const Out
 			os.put(c);
 		else if (c == META_INSET && (options & AS_STR_INSETS)) {
 			if (c == META_INSET && (options & AS_STR_PLAINTEXT)) {
-				LASSERT(runparams != 0, return docstring());
+				LASSERT(runparams != nullptr, return docstring());
 				getInset(i)->plaintext(os, *runparams);
 			} else {
 				getInset(i)->toString(os);
@@ -3883,14 +3885,14 @@ Inset * Paragraph::releaseInset(pos_type pos)
 Inset * Paragraph::getInset(pos_type pos)
 {
 	return (pos < pos_type(d->text_.size()) && d->text_[pos] == META_INSET)
-		 ? d->insetlist_.get(pos) : 0;
+		 ? d->insetlist_.get(pos) : nullptr;
 }
 
 
 Inset const * Paragraph::getInset(pos_type pos) const
 {
 	return (pos < pos_type(d->text_.size()) && d->text_[pos] == META_INSET)
-		 ? d->insetlist_.get(pos) : 0;
+		 ? d->insetlist_.get(pos) : nullptr;
 }
 
 
@@ -4157,7 +4159,7 @@ Language * Paragraph::Private::locateSpellRange(
 		++from;
 	// don't check empty range
 	if (from >= to)
-		return 0;
+		return nullptr;
 	// get current language
 	Language * lang = getSpellLanguage(from);
 	pos_type last = from;