More ascii-export fixes and when making copy of single tabular cells now the

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index ca6784f1ee74eaca260aedd67791637c4f4254d0..6024878ed4e724b9320a27a7c16e25e6f9fb67b0 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -367,7 +367,9 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                bv_->theLockingInset(the_locking_inset);
        }
        bv_->text->first = screen_->topCursorVisible(bv_->text);
+#if 0
        buffer_->resizeInsets(bv_);
+#endif
        // this will scroll the screen such that the cursor becomes visible
        updateScrollbar();
        redraw();
@@ -680,25 +682,25 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
 {
        // select a word
        if (!buffer_)
-           return;
+               return;
 
        LyXText * text = bv_->getLyXText();
 
        if (text->bv_owner && bv_->theLockingInset())
-           return;
+               return;
 
        if (screen_.get() && button == 1) {
-           if (text->bv_owner) {
-               screen_->hideCursor();
-               screen_->toggleSelection(text, bv_);
-               text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
-               screen_->toggleSelection(text, bv_, false);
-           } else {
-               text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
-           }
-           /* This will fit the cursor on the screen
-            * if necessary */
-           update(text, BufferView::SELECT|BufferView::FITCUR);
+               if (text->bv_owner) {
+                       screen_->hideCursor();
+                       screen_->toggleSelection(text, bv_);
+                       text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+                       screen_->toggleSelection(text, bv_, false);
+               } else {
+                       text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+               }
+               /* This will fit the cursor on the screen
+                * if necessary */
+               update(text, BufferView::SELECT|BufferView::FITCUR);
        }
 }
 
@@ -715,13 +717,17 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
            return;
 
        if (screen_.get() && (button == 1)) {
-               screen_->hideCursor();
-               screen_->toggleSelection(text, bv_);
+               if (text->bv_owner) {
+                       screen_->hideCursor();
+                       screen_->toggleSelection(text, bv_);
+               }
                text->cursorHome(bv_);
                text->selection.cursor = text->cursor;
                text->cursorEnd(bv_);
                text->setSelection(bv_);
-               screen_->toggleSelection(text, bv_, false);
+               if (text->bv_owner) {
+                       screen_->toggleSelection(text, bv_, false);
+               }
                /* This will fit the cursor on the screen
                 * if necessary */
                update(text, BufferView::SELECT|BufferView::FITCUR);
@@ -1554,7 +1560,8 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
        case LFUN_PASTESELECTION:
        {
                bool asPara = false;
-               if (argument == "paragraph") asPara = true;
+               if (argument == "paragraph")
+                       asPara = true;
                pasteClipboard(asPara);
        }
        break;