tdf#93837 sw: Convert comment context menu to xml

Change-Id: If449bff057a78802ed0b74d75a3c1a8a23def31a

27 files changed, 225 insertions, 52 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 70cc697e9d19..7903030ec700 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2452,6 +2452,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Comments...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Format All Comments...</value>
+        </prop>
       </node>
       <node oor:name=".uno:WordCountDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index ef6999a8acc2..e65812ddea20 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -20,6 +20,11 @@
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="WriterFormWindowState" oor:package="org.openoffice.Office.UI">
   <node oor:name="UIElements">
     <node oor:name="States">
+      <node oor:name="private:resource/popupmenu/annotation" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Comment</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Shape</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 7e3f9c9eee4e..c3b4c2038476 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -20,6 +20,11 @@
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="WriterGlobalWindowState" oor:package="org.openoffice.Office.UI">
   <node oor:name="UIElements">
     <node oor:name="States">
+      <node oor:name="private:resource/popupmenu/annotation" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Comment</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Shape</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index 0c6f004961ae..78465940dec4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -20,6 +20,11 @@
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="WriterReportWindowState" oor:package="org.openoffice.Office.UI">
   <node oor:name="UIElements">
     <node oor:name="States">
+      <node oor:name="private:resource/popupmenu/annotation" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Comment</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Shape</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 4f3ee1180f59..b6eca8013a48 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -20,6 +20,11 @@
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="WriterWebWindowState" oor:package="org.openoffice.Office.UI">
   <node oor:name="UIElements">
     <node oor:name="States">
+      <node oor:name="private:resource/popupmenu/annotation" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Comment</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/form" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Form Control</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index f54246e79043..a5bc6005e02e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -20,6 +20,11 @@
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="WriterWindowState" oor:package="org.openoffice.Office.UI">
   <node oor:name="UIElements">
     <node oor:name="States">
+      <node oor:name="private:resource/popupmenu/annotation" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Comment</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Shape</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index b90debc02ef0..1c71f757497d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -20,6 +20,11 @@
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="XFormsWindowState" oor:package="org.openoffice.Office.UI">
   <node oor:name="UIElements">
     <node oor:name="States">
+      <node oor:name="private:resource/popupmenu/annotation" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Comment</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Shape</value>
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk
index 6779f1dd5d3e..8d831d3d9af8 100644
--- a/sw/UIConfig_sglobal.mk
+++ b/sw/UIConfig_sglobal.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sglobal,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sglobal,\
+	sw/uiconfig/sglobal/popupmenu/annotation \
 	sw/uiconfig/sglobal/popupmenu/draw \
 	sw/uiconfig/sglobal/popupmenu/drawtext \
 	sw/uiconfig/sglobal/popupmenu/form \
diff --git a/sw/UIConfig_sweb.mk b/sw/UIConfig_sweb.mk
index daad88f5b880..7b7b809c9d70 100644
--- a/sw/UIConfig_sweb.mk
+++ b/sw/UIConfig_sweb.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sweb,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\
+	sw/uiconfig/sweb/popupmenu/annotation \
 	sw/uiconfig/sweb/popupmenu/form \
 	sw/uiconfig/sweb/popupmenu/frame \
 	sw/uiconfig/sweb/popupmenu/graphic \
diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk
index 91474a42747f..11dd732e5211 100644
--- a/sw/UIConfig_swform.mk
+++ b/sw/UIConfig_swform.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swform,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swform,\
+	sw/uiconfig/swform/popupmenu/annotation \
 	sw/uiconfig/swform/popupmenu/draw \
 	sw/uiconfig/swform/popupmenu/drawtext \
 	sw/uiconfig/swform/popupmenu/form \
diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk
index 8f7a79275703..aafac331196c 100644
--- a/sw/UIConfig_swreport.mk
+++ b/sw/UIConfig_swreport.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swreport,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swreport,\
+	sw/uiconfig/swreport/popupmenu/annotation \
 	sw/uiconfig/swreport/popupmenu/draw \
 	sw/uiconfig/swreport/popupmenu/drawtext \
 	sw/uiconfig/swreport/popupmenu/form \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 0adadbfc7db8..e34bbefe8086 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swriter,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\
+	sw/uiconfig/swriter/popupmenu/annotation \
 	sw/uiconfig/swriter/popupmenu/draw \
 	sw/uiconfig/swriter/popupmenu/drawtext \
 	sw/uiconfig/swriter/popupmenu/form \
diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk
index cebe2c4630b0..8c7994461e66 100644
--- a/sw/UIConfig_swxform.mk
+++ b/sw/UIConfig_swxform.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swxform,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swxform,\
+	sw/uiconfig/swxform/popupmenu/annotation \
 	sw/uiconfig/swxform/popupmenu/draw \
 	sw/uiconfig/swxform/popupmenu/drawtext \
 	sw/uiconfig/swxform/popupmenu/form \
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index f43ed50ef1f8..2ad6d07c9b8a 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -9746,6 +9746,9 @@ SfxVoidItem DeleteAuthor FN_DELETE_NOTE_AUTHOR ( SfxStringItem Author FN_DELETE_
     RecordPerSet;
     Synchron;
 
+    /* status: */
+    SlotType = SfxStringItem
+
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
@@ -9841,6 +9844,9 @@ SfxVoidItem HideAuthor FN_HIDE_NOTE_AUTHOR ( SfxStringItem Author FN_HIDE_NOTE_A
     RecordPerSet;
     Synchron;
 
+    /* status: */
+    SlotType = SfxStringItem
+
     /* config: */
     AccelConfig = FALSE,
     MenuConfig = FALSE,
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index b60a7b0a32c4..b73d10c7b573 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -466,6 +466,16 @@ String STR_REDLINE_UNKNOWN_AUTHOR
     Text [ en-US ] = "Unknown Author";
 };
 
+String STR_DELETE_NOTE_AUTHOR
+{
+    Text [ en-US ] = "Delete ~All Comments by $1";
+};
+
+String STR_HIDE_NOTE_AUTHOR
+{
+    Text [ en-US ] = "H~ide All Comments by $1";
+};
+
 String  STR_DONT_ASK_AGAIN
 {
     Text [ en-US ] = "~Do not show warning again" ;
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 7b197251ae8d..70031ded8dbc 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -86,14 +86,6 @@
 
 /*--Popups---------------------------------------------------------------*/
 
-Menu MN_ANNOTATION_POPUPMENU
-{
-    ItemList =
-    {
-        MN_ANNOTATIONS
-    };
-};
-
 Menu MN_ANNOTATION_BUTTON
 {
     ItemList =
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index d8ff85a8385c..51c2c040e909 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -35,7 +35,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/mnumgr.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
@@ -55,7 +54,6 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <shellres.hxx>
-#include <SwRewriter.hxx>
 #include <memory>
 
 namespace sw { namespace sidebarwindows {
@@ -366,12 +364,6 @@ IMPL_LINK_TYPED( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo&, rI
     }
 }
 
-IMPL_LINK_TYPED( SidebarTextControl, Select, Menu*, pSelMenu, bool )
-{
-    mrSidebarWin.ExecuteCommand( pSelMenu->GetCurItemId() );
-    return false;
-}
-
 void SidebarTextControl::Command( const CommandEvent& rCEvt )
 {
     if ( rCEvt.GetCommand() == CommandEventId::ContextMenu )
@@ -384,32 +376,7 @@ void SidebarTextControl::Command( const CommandEvent& rCEvt )
             GetTextView()->ExecuteSpellPopup(rCEvt.GetMousePosPixel(),&aLink);
         }
         else
-        {
-            std::unique_ptr<SfxPopupMenuManager> pMgr(SfxDispatcher::Popup(0, this,&rCEvt.GetMousePosPixel()));
-            static_cast<PopupMenu*>(pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTextControl, Select) );
-
-            {
-                OUString aText = static_cast<PopupMenu*>(pMgr->GetSVMenu())->GetItemText( FN_DELETE_NOTE_AUTHOR );
-                SwRewriter aRewriter;
-                aRewriter.AddRule(UndoArg1, mrSidebarWin.GetAuthor());
-                aText = aRewriter.Apply(aText);
-                static_cast<PopupMenu*>(pMgr->GetSVMenu())->SetItemText(FN_DELETE_NOTE_AUTHOR,aText);
-            }
-
-            Point aPos;
-            if (rCEvt.IsMouseEvent())
-                aPos = rCEvt.GetMousePosPixel();
-            else
-            {
-                const Size aSize = GetSizePixel();
-                aPos = Point( aSize.getWidth()/2, aSize.getHeight()/2 );
-            }
-
-            //!! call different Execute function to get rid of the new thesaurus sub menu
-            //!! pointer created in the call to Popup.
-            //!! Otherwise we would have a memory leak (see also #i107205#)
-            pMgr->Execute( aPos, this );
-        }
+            SfxDispatcher::ExecutePopup(this, &rCEvt.GetMousePosPixel());
     }
     else
     if (rCEvt.GetCommand() == CommandEventId::Wheel)
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index 71428981f1e9..a70194272f28 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -48,8 +48,6 @@ class SidebarTextControl : public Control
         virtual OUString GetSurroundingText() const override;
         virtual Selection GetSurroundingTextSelection() const override;
 
-        DECL_LINK_TYPED( Select, Menu*, bool );
-
     public:
         SidebarTextControl( SwSidebarWin& rSidebarWin,
                            WinBits nBits,
diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc
index 6feb83f6031e..b5264d69f7e9 100644
--- a/sw/source/uibase/inc/app.hrc
+++ b/sw/source/uibase/inc/app.hrc
@@ -39,6 +39,8 @@
 #define STR_REDLINE_UNKNOWN_AUTHOR      (RC_APP_BEGIN + 76)
 #define STR_WESTERN_FONT                (RC_APP_BEGIN + 77)
 #define STR_CJK_FONT                    (RC_APP_BEGIN + 78)
+#define STR_DELETE_NOTE_AUTHOR          (RC_APP_BEGIN + 79)
+#define STR_HIDE_NOTE_AUTHOR            (RC_APP_BEGIN + 80)
 
 #define STR_ENV_TITLE                   (RC_APP_BEGIN + 91)
 #define STR_LAB_TITLE                   (RC_APP_BEGIN + 92)
diff --git a/sw/source/uibase/inc/popup.hrc b/sw/source/uibase/inc/popup.hrc
index 343b710850bc..4f0e83fccfec 100644
--- a/sw/source/uibase/inc/popup.hrc
+++ b/sw/source/uibase/inc/popup.hrc
@@ -22,10 +22,9 @@
 
 #include "rcid.hrc"
 
-#define MN_ANNOTATION_POPUPMENU     (RC_POPUPS_BEGIN + 0)
-#define MN_ANNOTATION_BUTTON        (RC_POPUPS_BEGIN + 1)
-#define MN_HEADERFOOTER_BUTTON      (RC_POPUPS_BEGIN + 2)
-#define MN_PAGEBREAK_BUTTON         (RC_POPUPS_BEGIN + 3)
+#define MN_ANNOTATION_BUTTON        (RC_POPUPS_BEGIN + 0)
+#define MN_HEADERFOOTER_BUTTON      (RC_POPUPS_BEGIN + 1)
+#define MN_PAGEBREAK_BUTTON         (RC_POPUPS_BEGIN + 2)
 
 #if MN_PAGEBREAK_BUTTON > RC_POPUPS_END
 
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 23fc94c27914..7e3a3faf63a6 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -85,6 +85,7 @@
 #include <edtwin.hxx>
 #include <swwait.hxx>
 #include <docstat.hxx>
+#include <SwRewriter.hxx>
 
 #include <cmdid.h>
 #include <globals.hrc>
@@ -141,7 +142,7 @@ void SwAnnotationShell::InitInterface_Impl()
 {
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
 
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_ANNOTATION_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("annotation");
 }
 
 
@@ -1117,6 +1118,8 @@ void SwAnnotationShell::NoteExec(SfxRequest &rReq)
             const SfxStringItem* pItem = rReq.GetArg<SfxStringItem>(nSlot);
             if ( pItem )
                 pPostItMgr->Delete( pItem->GetValue() );
+            else
+                pPostItMgr->Delete( pPostItMgr->GetActiveSidebarWin()->GetAuthor() );
             break;
         }
         case FN_HIDE_NOTE:
@@ -1129,6 +1132,8 @@ void SwAnnotationShell::NoteExec(SfxRequest &rReq)
             const SfxStringItem* pItem = rReq.GetArg<SfxStringItem>(nSlot);
             if ( pItem )
                 pPostItMgr->Hide( pItem->GetValue() );
+            else
+                pPostItMgr->Hide( pPostItMgr->GetActiveSidebarWin()->GetAuthor() );
         }
     }
 }
@@ -1144,11 +1149,9 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
         switch( nSlotId )
         {
         case FN_POSTIT:
-        case FN_DELETE_NOTE_AUTHOR:
         case FN_DELETE_ALL_NOTES:
         case FN_FORMAT_ALL_NOTES:
         case FN_HIDE_NOTE:
-        case FN_HIDE_NOTE_AUTHOR:
         case FN_HIDE_ALL_NOTES:
         case FN_DELETE_COMMENT:
             {
@@ -1159,7 +1162,26 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
                 }
                 break;
             }
-
+        case FN_DELETE_NOTE_AUTHOR:
+        case FN_HIDE_NOTE_AUTHOR:
+        {
+            if( !pPostItMgr
+                || !pPostItMgr->HasActiveAnnotationWin() )
+            {
+                rSet.DisableItem(nWhich);
+            }
+            else
+            {
+                OUString aText( nSlotId == FN_DELETE_NOTE_AUTHOR ?
+                                SW_RES( STR_DELETE_NOTE_AUTHOR ) : SW_RES( STR_HIDE_NOTE_AUTHOR ) );
+                SwRewriter aRewriter;
+                aRewriter.AddRule( UndoArg1, pPostItMgr->GetActiveSidebarWin()->GetAuthor() );
+                aText = aRewriter.Apply( aText );
+                SfxStringItem aItem( nSlotId, aText );
+                rSet.Put( aItem );
+            }
+            break;
+        }
         case FN_REPLY:
             {
                 if ( !pPostItMgr ||
diff --git a/sw/uiconfig/sglobal/popupmenu/annotation.xml b/sw/uiconfig/sglobal/popupmenu/annotation.xml
new file mode 100644
index 000000000000..8bb8fdf31f04
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/annotation.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ReplyComment"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:DeleteComment"/>
+  <menu:menuitem menu:id=".uno:DeleteAuthor"/>
+  <menu:menuitem menu:id=".uno:DeleteAllNotes"/>
+  <menu:menuitem menu:id=".uno:FormatAllNotes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/annotation.xml b/sw/uiconfig/sweb/popupmenu/annotation.xml
new file mode 100644
index 000000000000..8bb8fdf31f04
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/annotation.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ReplyComment"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:DeleteComment"/>
+  <menu:menuitem menu:id=".uno:DeleteAuthor"/>
+  <menu:menuitem menu:id=".uno:DeleteAllNotes"/>
+  <menu:menuitem menu:id=".uno:FormatAllNotes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/annotation.xml b/sw/uiconfig/swform/popupmenu/annotation.xml
new file mode 100644
index 000000000000..8bb8fdf31f04
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/annotation.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ReplyComment"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:DeleteComment"/>
+  <menu:menuitem menu:id=".uno:DeleteAuthor"/>
+  <menu:menuitem menu:id=".uno:DeleteAllNotes"/>
+  <menu:menuitem menu:id=".uno:FormatAllNotes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swreport/popupmenu/annotation.xml b/sw/uiconfig/swreport/popupmenu/annotation.xml
new file mode 100644
index 000000000000..8bb8fdf31f04
--- /dev/null
+++ b/sw/uiconfig/swreport/popupmenu/annotation.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ReplyComment"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:DeleteComment"/>
+  <menu:menuitem menu:id=".uno:DeleteAuthor"/>
+  <menu:menuitem menu:id=".uno:DeleteAllNotes"/>
+  <menu:menuitem menu:id=".uno:FormatAllNotes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swriter/popupmenu/annotation.xml b/sw/uiconfig/swriter/popupmenu/annotation.xml
new file mode 100644
index 000000000000..8bb8fdf31f04
--- /dev/null
+++ b/sw/uiconfig/swriter/popupmenu/annotation.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ReplyComment"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:DeleteComment"/>
+  <menu:menuitem menu:id=".uno:DeleteAuthor"/>
+  <menu:menuitem menu:id=".uno:DeleteAllNotes"/>
+  <menu:menuitem menu:id=".uno:FormatAllNotes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swxform/popupmenu/annotation.xml b/sw/uiconfig/swxform/popupmenu/annotation.xml
new file mode 100644
index 000000000000..8bb8fdf31f04
--- /dev/null
+++ b/sw/uiconfig/swxform/popupmenu/annotation.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ReplyComment"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:DeleteComment"/>
+  <menu:menuitem menu:id=".uno:DeleteAuthor"/>
+  <menu:menuitem menu:id=".uno:DeleteAllNotes"/>
+  <menu:menuitem menu:id=".uno:FormatAllNotes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>