[Libreoffice-commits] core.git: sw/sdi sw/source

[Libreoffice Gerrit user]

 sw/sdi/_annotsh.sdi                 |    7 +++++++
 sw/source/uibase/shells/annotsh.cxx |    5 +++++
 2 files changed, 12 insertions(+)

New commits:
commit 4d8a5ebdf9d2bef608a77559e93b5c543acfe6fd
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Sun Sep 2 14:40:45 2018 +0300
Commit:     Maxim Monastirsky <momonasmon at gmail.com>
CommitDate: Sun Sep 2 19:30:04 2018 +0200

    tdf#117835 Paste as Unformatted for comments in Writer
    
    Change-Id: Ia96f8c51cc0a3898c1169454bd7c3031e08c45d4
    Reviewed-on: https://gerrit.libreoffice.org/59906
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index 27c200944c0f..e271625bcdd8 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -96,6 +96,13 @@ interface _Annotation
         DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
     ]
 
+    SID_PASTE_UNFORMATTED
+    [
+        ExecMethod = ExecClpbrd ;
+        StateMethod = StateClpbrd ;
+        DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+    ]
+
     SID_PASTE_SPECIAL  // api:
     [
         StateMethod = StateClpbrd ;
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 19a513387e3f..9a519715a5c9 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -906,6 +906,10 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest const &rReq)
             if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
                 pOLV->PasteSpecial();
             break;
+        case SID_PASTE_UNFORMATTED:
+            if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
+                pOLV->Paste();
+            break;
         case SID_PASTE_SPECIAL:
         {
             if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
@@ -986,6 +990,7 @@ void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet)
                 break;
             }
             case SID_PASTE:
+            case SID_PASTE_UNFORMATTED:
             case SID_PASTE_SPECIAL:
                 {
                     if( !bPastePossible )