diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-08-13 13:37:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-17 13:54:37 +0200 |
| commit | a0636486e54bf9c8cf35657368e2779792da8b6d (patch) | |
| tree | 5a0f5947160c5dad32ee5d81f3bd4524d32c4471 /editeng | |
| parent | a407285747c65894bc858c4aa722a24e57caca31 (diff) | |
tdf#110988 Middle click does not paste primary selection
regression from commit 65b7b6322b662785bf032e66c76abc36c9a2bb0e
"loplugin:unusedenumconstants read-only constants in vcl"
Reviewed-on: https://gerrit.libreoffice.org/41111
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 5b3b0a91edc4c468c7c9c132cd066c0d25de9706)
Change-Id: I262dd4c9cd1dc6eca82521f5fd9fbfc952fb7745
Reviewed-on: https://gerrit.libreoffice.org/41133
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 10c7e9650fba..dcecf17887a6 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1285,7 +1285,13 @@ bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent ) nExtraCursorFlags = GetCursorFlags::NONE; bClickedInSelection = false; - if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() ) + if ( rMouseEvent.IsMiddle() && !bReadOnly && + ( GetWindow()->GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection ) ) + { + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection()); + Paste( aClipBoard ); + } + else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() ) { Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection()); CutCopy( aClipBoard, false ); |