make redoParagraph more independent of current cursor

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 7a3dbd065df40f28115fb24c6c09c873f5dec906..8a7bee84b17775a0551cb9843ed534cf10371ba5 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -40,7 +40,6 @@
 
 #include "support/FileInfo.h"
 #include "support/filetools.h"
-#include "support/lyxfunctional.h" // equal_1st_in_pair
 #include "support/types.h"
 #include "support/lyxalgo.h" // lyx_count
 
@@ -239,12 +238,6 @@ void BufferView::toggleSelection(bool b)
 }
 
 
-void BufferView::toggleToggle()
-{
-       pimpl_->toggleToggle();
-}
-
-
 void BufferView::center()
 {
        pimpl_->center();
@@ -380,7 +373,7 @@ void BufferView::setCursorFromRow(int row)
 }
 
 
-bool BufferView::insertInset(Inset * inset, string const & lout)
+bool BufferView::insertInset(InsetOld * inset, string const & lout)
 {
        return pimpl_->insertInset(inset, lout);
 }
@@ -517,7 +510,7 @@ bool BufferView::lockInset(UpdatableInset * inset)
                if (text->cursor.pos() < text->cursor.par()->size()
                    && text->cursor.par()->getChar(text->cursor.pos()) ==
                    Paragraph::META_INSET) {
-                       Inset * in = text->cursor.par()->getInset(text->cursor.pos());
+                       InsetOld * in = text->cursor.par()->getInset(text->cursor.pos());
                        if (inset == in) {
                                theLockingInset(inset);
                                return true;
@@ -594,23 +587,13 @@ int BufferView::unlockInset(UpdatableInset * inset)
 }
 
 
-void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
-{
-       if (!theLockingInset())
-               return; // shouldn't happen
-       if (kind == Undo::EDIT) // in this case insets would not be stored!
-               kind = Undo::FINISH;
-       setUndo(this, kind, text->cursor.par());
-}
-
-
-void BufferView::updateInset(Inset * inset)
+void BufferView::updateInset(InsetOld * inset)
 {
        pimpl_->updateInset(inset);
 }
 
 
-bool BufferView::ChangeInsets(Inset::Code code,
+bool BufferView::ChangeInsets(InsetOld::Code code,
                              string const & from, string const & to)
 {
        bool need_update = false;
@@ -642,8 +625,7 @@ bool BufferView::ChangeInsets(Inset::Code code,
                        // How to set the cursor corretly when it.size()>1 ??
                        if (it.size() == 1) {
                                text->setCursorIntern(it.pit(), 0);
-                               text->redoParagraphs(text->cursor,
-                                                    boost::next(text->cursor.par()));
+                               text->redoParagraph(text->cursor.par());
                                text->partialRebreak();
                        }
                }
@@ -662,22 +644,7 @@ bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
        if (lyx::count(labels.begin(), labels.end(), from) > 1)
                return false;
 
-       return ChangeInsets(Inset::REF_CODE, from, to);
-}
-
-
-bool BufferView::ChangeCitationsIfUnique(string const & from, string const & to)
-{
-       typedef pair<string, string> StringPair;
-
-       vector<StringPair> keys;
-       buffer()->fillWithBibKeys(keys);
-       if (count_if(keys.begin(), keys.end(),
-                    lyx::equal_1st_in_pair<StringPair>(from))
-           > 1)
-               return false;
-
-       return ChangeInsets(Inset::CITE_CODE, from, to);
+       return ChangeInsets(InsetOld::REF_CODE, from, to);
 }
 
 
@@ -707,7 +674,7 @@ LyXText * BufferView::getLyXText() const
 }
 
 
-LyXText * BufferView::getParentText(Inset * inset) const
+LyXText * BufferView::getParentText(InsetOld * inset) const
 {
        if (inset->owner()) {
                LyXText * txt = inset->getLyXText(this);
@@ -721,7 +688,7 @@ LyXText * BufferView::getParentText(Inset * inset) const
 }
 
 
-Language const * BufferView::getParentLanguage(Inset * inset) const
+Language const * BufferView::getParentLanguage(InsetOld * inset) const
 {
        LyXText * text = getParentText(inset);
        return text->cursor.par()->getFontSettings(buffer()->params,