[LyX/2.1.x] Call DEPM properly when going somewhere with outliner.

2015-03-30 Thread Jean-Marc Lasgouttes
commit c966875ecefe5ea59a7f1a9fb9dcc669ec454a1e
Author: Jean-Marc Lasgouttes lasgout...@lyx.org
Date:   Thu Mar 26 10:27:59 2015 +0100

Call DEPM properly when going somewhere with outliner.

LFUN_PARAGRAPH_GOTO used to do a plain setCursor, whereas the more 
elaborate mouseSetCursor is a much better version.

Fixes bug #9479.

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2bd7f72..65d3683 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1392,20 +1392,21 @@ void BufferView::dispatch(FuncRequest const  cmd, 
DispatchResult  dr)
for (Buffer * b = buffer_; i == 0 || b != buffer_;
b = theBufferList().next(b)) {
 
-   DocIterator dit = b-getParFromID(id);
-   if (dit.atEnd()) {
+   Cursor cur(*this);
+   cur.setCursor(b-getParFromID(id));
+   if (cur.atEnd()) {
LYXERR(Debug::INFO, No matching paragraph 
found! [  id  ].);
++i;
continue;
}
-   LYXERR(Debug::INFO, Paragraph   dit.paragraph().id()
+   LYXERR(Debug::INFO, Paragraph   cur.paragraph().id()
  found in buffer `
 b-absFileName()  '.);
 
if (b == buffer_) {
// Set the cursor
-   dit.pos() = pos;
-   setCursor(dit);
+   cur.pos() = pos;
+   mouseSetCursor(cur);
dr.screenUpdate(Update::Force | 
Update::FitCursor);
} else {
// Switch to other buffer view and resend cmd
diff --git a/status.21x b/status.21x
index 9f851b8..488f6a1 100644
--- a/status.21x
+++ b/status.21x
@@ -149,6 +149,9 @@ What's new
 
 - Fix selection of Interlingua user interface (bug 9267).
 
+- Delete empty paragaphs as needed when navigating the document using
+  outline mode (bug 9479).
+
 
 * INTERNALS
 


[LyX/2.1.x] Call DEPM properly when going somewhere with outliner.

2015-03-30 Thread Jean-Marc Lasgouttes
commit c966875ecefe5ea59a7f1a9fb9dcc669ec454a1e
Author: Jean-Marc Lasgouttes 
Date:   Thu Mar 26 10:27:59 2015 +0100

Call DEPM properly when going somewhere with outliner.

LFUN_PARAGRAPH_GOTO used to do a plain setCursor, whereas the more 
elaborate mouseSetCursor is a much better version.

Fixes bug #9479.

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2bd7f72..65d3683 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1392,20 +1392,21 @@ void BufferView::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
for (Buffer * b = _; i == 0 || b != _;
b = theBufferList().next(b)) {
 
-   DocIterator dit = b->getParFromID(id);
-   if (dit.atEnd()) {
+   Cursor cur(*this);
+   cur.setCursor(b->getParFromID(id));
+   if (cur.atEnd()) {
LYXERR(Debug::INFO, "No matching paragraph 
found! [" << id << "].");
++i;
continue;
}
-   LYXERR(Debug::INFO, "Paragraph " << dit.paragraph().id()
+   LYXERR(Debug::INFO, "Paragraph " << cur.paragraph().id()
<< " found in buffer `"
<< b->absFileName() << "'.");
 
if (b == _) {
// Set the cursor
-   dit.pos() = pos;
-   setCursor(dit);
+   cur.pos() = pos;
+   mouseSetCursor(cur);
dr.screenUpdate(Update::Force | 
Update::FitCursor);
} else {
// Switch to other buffer view and resend cmd
diff --git a/status.21x b/status.21x
index 9f851b8..488f6a1 100644
--- a/status.21x
+++ b/status.21x
@@ -149,6 +149,9 @@ What's new
 
 - Fix selection of Interlingua user interface (bug 9267).
 
+- Delete empty paragaphs as needed when navigating the document using
+  outline mode (bug 9479).
+
 
 * INTERNALS