Small formatting and comment cleanup.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16838 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 2330b999e8b7836500131f9103ecea8c120acd45..d752aeff1efa4b12ab7c8285ae9d95aa4777d4a3 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -280,25 +280,26 @@ void InsetText::setChange(Change const & change)
 void InsetText::acceptChanges(BufferParams const & bparams)
 {
        ParagraphList & pars = paragraphs();
-       pit_type const parsize = (pit_type) pars.size();
-
-       // first, accept changes within each individual paragraph (do not consider end-of-par)
-       for (pit_type pit = 0; pit < parsize; ++pit) {
-               if (pars[pit].size() != 0)   // prevent assertion failure 
-                       pars[pit].acceptChanges(bparams, 0, pars[pit].size());
+       pit_type const pars_size = (pit_type) pars.size();
+
+       // first, accept changes within each individual paragraph
+       // (do not consider end-of-par)
+       for (pit_type pit = 0; pit < pars_size; ++pit) {
+               if (pars[pit].empty())   // prevent assertion failure 
+                       continue;
+               pars[pit].acceptChanges(bparams, 0, pars[pit].size());
        }
 
        // next, accept imaginary end-of-par characters
- 
-       for (pit_type pit = 0; pit < parsize; ++pit) {
+       for (pit_type pit = 0; pit < pars_size; ++pit) {
                pos_type pos = pars[pit].size();
 
                if (pars[pit].isInserted(pos)) {
                        pars[pit].setChange(pos, Change(Change::UNCHANGED));
                } else if (pars[pit].isDeleted(pos)) {
                        if (pit == pars.size() - 1) {
-                               // we cannot remove a par break at the end of the last paragraph;
-                               // instead, we mark it unchanged
+                               // we cannot remove a par break at the end of the last
+                               // paragraph; instead, we mark it unchanged
                                pars[pit].setChange(pos, Change(Change::UNCHANGED));
                        } else {
                                mergeParagraph(bparams, pars, pit);
@@ -308,31 +309,34 @@ void InsetText::acceptChanges(BufferParams const & bparams)
        }
 
        // FIXME: finally, invoke the DEPM
+       // This cannot be done here but at a higher calling level
+       // because we need BufferView::checkDepm().
 }
 
 
 void InsetText::rejectChanges(BufferParams const & bparams)
 {
        ParagraphList & pars = paragraphs();
-       pit_type const parsize = (pit_type) pars.size();
-
-       // first, reject changes within each individual paragraph (do not consider end-of-par)
-       
-       for (pit_type pit = 0; pit < parsize; ++pit) {
-               if (pars[pit].size() != 0)   // prevent assertion failure
-                       pars[pit].rejectChanges(bparams, 0, pars[pit].size());
+       pit_type const pars_size = (pit_type) pars.size();
+
+       // first, reject changes within each individual paragraph (do not
+       // consider end-of-par)         
+       for (pit_type pit = 0; pit < pars_size; ++pit) {
+               if (pars[pit].empty())   // prevent assertion failure 
+                       continue;
+               pars[pit].rejectChanges(bparams, 0, pars[pit].size());
        }
 
        // next, reject imaginary end-of-par characters
- 
-       for (pit_type pit = 0; pit < parsize; ++pit) {
+       for (pit_type pit = 0; pit < pars_size; ++pit) {
                pos_type pos = pars[pit].size();
 
                if (pars[pit].isDeleted(pos)) {
                        pars[pit].setChange(pos, Change(Change::UNCHANGED));
                } else if (pars[pit].isInserted(pos)) {
                        if (pit == pars.size() - 1) {
-                               // we mark the par break at the end of the last paragraph unchanged
+                               // we mark the par break at the end of the last
+                               // paragraph unchanged
                                pars[pit].setChange(pos, Change(Change::UNCHANGED));
                        } else {
                                mergeParagraph(bparams, pars, pit);
@@ -342,6 +346,8 @@ void InsetText::rejectChanges(BufferParams const & bparams)
        }
 
        // FIXME: finally, invoke the DEPM
+       // This cannot be done here but at a higher calling level
+       // because we need BufferView::checkDepm().
 }