[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/docvw/edtwin.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit b6310c1e403b80e2c6b87f2cfc1ab9132ecd90e0
Author:     Ilhan Yesil <ilhanyesil at gmx.de>
AuthorDate: Tue Jul 31 14:36:28 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Sep 14 13:21:19 2018 +0200

    tdf#119016 Editing a read-only section shall popup a dialog
    
    While processing the key input, an additional if statement for the
    paste command (Ctrl+V) is added.
    
    Change-Id: If205589256855422ac93f8a5ed8a1ee394ca9310
    Reviewed-on: https://gerrit.libreoffice.org/58360
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 66838c2418df4d016be0da0ef1c7e54934c03421)
    Reviewed-on: https://gerrit.libreoffice.org/60269
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index b8b8b588c296..cd8347f707ef 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2321,7 +2321,13 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 if( !m_aInBuffer.isEmpty() && ( !bNormalChar || bIsDocReadOnly ))
                     FlushInBuffer();
 
-                if( m_rView.KeyInput( aKeyEvent ) )
+                if (rSh.HasReadonlySel() && rKeyCode.GetFunction() == KeyFuncType::PASTE)
+                {
+                    auto xInfo(std::make_shared<weld::GenericDialogController>(GetFrameWeld(), "modules/swriter/ui/inforeadonlydialog.ui", "InfoReadonlyDialog"));
+                    weld::DialogController::runAsync(xInfo, [](int) {});
+                    eKeyState = SwKeyState::End;
+                }
+                else if( m_rView.KeyInput( aKeyEvent ) )
                 {
                     bFlushBuffer = true;
                     bNormalChar = false;