don't rm emergency saves ever

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index a29dd641853c56de9e50feecb52b4f07afe059cb..260d5d801dedac578fb3eb28006a4e9e0c2b638d 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -84,12 +84,11 @@ void Paragraph::Pimpl::clear()
 }
 
 
-void Paragraph::Pimpl::setContentsFromPar(Paragraph const * par)
+void Paragraph::Pimpl::setContentsFromPar(Paragraph const & par)
 {
-       lyx::Assert(par);
-       text = par->pimpl_->text;
-       if (par->pimpl_->tracking()) {
-               changes_.reset(new Changes(*(par->pimpl_->changes_.get())));
+       text = par.pimpl_->text;
+       if (par.pimpl_->tracking()) {
+               changes_.reset(new Changes(*(par.pimpl_->changes_.get())));
        }
 }
 
@@ -336,29 +335,6 @@ void Paragraph::Pimpl::insertInset(pos_type pos,
 }
 
 
-bool Paragraph::Pimpl::erasePos(pos_type pos)
-{
-       lyx::Assert(pos < size());
-
-       if (tracking()) {
-               Change::Type changetype(changes_->lookup(pos));
-               changes_->record(Change(Change::DELETED), pos);
-
-               // only allow the actual removal if it was /new/ text
-               if (changetype != Change::INSERTED) {
-                       if (text[pos] == Paragraph::META_INSET) {
-                               Inset * i(owner_->getInset(pos));
-                               i->markErased();
-                       }
-                       return false;
-               }
-       }
-
-       eraseIntern(pos);
-       return true;
-}
-
-
 void Paragraph::Pimpl::eraseIntern(pos_type pos)
 {
        // if it is an inset, delete the inset entry
@@ -403,9 +379,26 @@ void Paragraph::Pimpl::eraseIntern(pos_type pos)
 }
 
 
-void Paragraph::Pimpl::erase(pos_type pos)
+bool Paragraph::Pimpl::erase(pos_type pos)
 {
-       erasePos(pos);
+       lyx::Assert(pos < size());
+
+       if (tracking()) {
+               Change::Type changetype(changes_->lookup(pos));
+               changes_->record(Change(Change::DELETED), pos);
+
+               // only allow the actual removal if it was /new/ text
+               if (changetype != Change::INSERTED) {
+                       if (text[pos] == Paragraph::META_INSET) {
+                               Inset * i(owner_->getInset(pos));
+                               i->markErased();
+                       }
+                       return false;
+               }
+       }
+
+       eraseIntern(pos);
+       return true;
 }
 
 
@@ -414,9 +407,9 @@ int Paragraph::Pimpl::erase(pos_type start, pos_type end)
        pos_type i = start;
        pos_type count = end - start;
        while (count) {
-               if (!erasePos(i)) {
+               if (!erase(i)) {
                        ++i;
-               } 
+               }
                --count;
        }
        return end - i;
@@ -448,7 +441,7 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
                     || getChar(i - 1) == '!'))) {
                os << '\n';
                texrow.newline();
-               texrow.start(owner_, i + 1);
+               texrow.start(owner_->id(), i + 1);
                column = 0;
        } else if (style.free_spacing) {
                os << '~';
@@ -547,7 +540,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                os << "\\\\\n";
                        }
                        texrow.newline();
-                       texrow.start(owner_, i + 1);
+                       texrow.start(owner_->id(), i + 1);
                        column = 0;
                        break;
                }
@@ -596,7 +589,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                        for (int j = 0; j < tmp; ++j) {
                                texrow.newline();
                        }
-                       texrow.start(owner_, i + 1);
+                       texrow.start(owner_->id(), i + 1);
                        column = 0;
                } else {
                        column += int(os.tellp()) - len;