[Libreoffice-commits] core.git: 2 commits - include/sfx2 include/svx officecfg/registry svx/inc svx/Library_svx.mk svx/source sw/inc sw/source sw/uiconfig sw/UIConfig_sglobal.mk sw/UIConfig_sweb.mk sw/UIConfig_swform.mk sw/UIConfig_swreport.mk sw/UIConfig_swriter.mk sw/UIConfig_swxform.mk

Mon Jan 18 16:06:43 PST 2016

include/sfx2/sfxcommands.h                                                   |    3 
 include/svx/SmartTagCtl.hxx                                                  |   79 
 include/svx/svxcommands.h                                                    |    2 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu         |    8 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu          |   27 
 officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu   |   40 
 officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu |   40 
 officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu |   40 
 officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu    |   30 
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu       |   40 
 officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu       |   40 
 svx/Library_svx.mk                                                           |    1 
 svx/inc/globlmn_tmpl.hrc                                                     |   85 
 svx/source/mnuctrls/SmartTagCtl.cxx                                          |  199 -
 sw/UIConfig_sglobal.mk                                                       |    8 
 sw/UIConfig_sweb.mk                                                          |    6 
 sw/UIConfig_swform.mk                                                        |    8 
 sw/UIConfig_swreport.mk                                                      |    8 
 sw/UIConfig_swriter.mk                                                       |    8 
 sw/UIConfig_swxform.mk                                                       |    8 
 sw/inc/helpid.h                                                              |    2 
 sw/inc/swcommands.h                                                          |   58 
 sw/source/ui/app/mn.src                                                      | 1204 ----------
 sw/source/uibase/app/swmodule.cxx                                            |    2 
 sw/source/uibase/inc/popup.hrc                                               |   19 
 sw/source/uibase/shells/beziersh.cxx                                         |    2 
 sw/source/uibase/shells/drawsh.cxx                                           |    2 
 sw/source/uibase/shells/drformsh.cxx                                         |    2 
 sw/source/uibase/shells/drwtxtsh.cxx                                         |    2 
 sw/source/uibase/shells/frmsh.cxx                                            |    2 
 sw/source/uibase/shells/grfsh.cxx                                            |    2 
 sw/source/uibase/shells/mediash.cxx                                          |    2 
 sw/source/uibase/shells/olesh.cxx                                            |    2 
 sw/source/uibase/shells/textsh.cxx                                           |    2 
 sw/source/uibase/uiview/srcview.cxx                                          |    2 
 sw/source/uibase/uiview/view.src                                             |   29 
 sw/source/uibase/web/wformsh.cxx                                             |    2 
 sw/source/uibase/web/wfrmsh.cxx                                              |    2 
 sw/source/uibase/web/wgrfsh.cxx                                              |    2 
 sw/source/uibase/web/wolesh.cxx                                              |    2 
 sw/source/uibase/web/wtextsh.cxx                                             |    2 
 sw/uiconfig/sglobal/popupmenu/draw.xml                                       |   79 
 sw/uiconfig/sglobal/popupmenu/drawtext.xml                                   |   27 
 sw/uiconfig/sglobal/popupmenu/form.xml                                       |   74 
 sw/uiconfig/sglobal/popupmenu/frame.xml                                      |   62 
 sw/uiconfig/sglobal/popupmenu/graphic.xml                                    |   74 
 sw/uiconfig/sglobal/popupmenu/media.xml                                      |   70 
 sw/uiconfig/sglobal/popupmenu/oleobject.xml                                  |   62 
 sw/uiconfig/sglobal/popupmenu/table.xml                                      |    1 
 sw/uiconfig/sglobal/popupmenu/text.xml                                       |   53 
 sw/uiconfig/sweb/popupmenu/form.xml                                          |   74 
 sw/uiconfig/sweb/popupmenu/frame.xml                                         |   62 
 sw/uiconfig/sweb/popupmenu/graphic.xml                                       |   74 
 sw/uiconfig/sweb/popupmenu/oleobject.xml                                     |   62 
 sw/uiconfig/sweb/popupmenu/source.xml                                        |   16 
 sw/uiconfig/sweb/popupmenu/table.xml                                         |    1 
 sw/uiconfig/sweb/popupmenu/text.xml                                          |   49 
 sw/uiconfig/swform/popupmenu/draw.xml                                        |   79 
 sw/uiconfig/swform/popupmenu/drawtext.xml                                    |   27 
 sw/uiconfig/swform/popupmenu/form.xml                                        |   74 
 sw/uiconfig/swform/popupmenu/frame.xml                                       |   62 
 sw/uiconfig/swform/popupmenu/graphic.xml                                     |   74 
 sw/uiconfig/swform/popupmenu/media.xml                                       |   70 
 sw/uiconfig/swform/popupmenu/oleobject.xml                                   |   62 
 sw/uiconfig/swform/popupmenu/table.xml                                       |    1 
 sw/uiconfig/swform/popupmenu/text.xml                                        |   53 
 sw/uiconfig/swreport/popupmenu/draw.xml                                      |   79 
 sw/uiconfig/swreport/popupmenu/drawtext.xml                                  |   27 
 sw/uiconfig/swreport/popupmenu/form.xml                                      |   74 
 sw/uiconfig/swreport/popupmenu/frame.xml                                     |   62 
 sw/uiconfig/swreport/popupmenu/graphic.xml                                   |   74 
 sw/uiconfig/swreport/popupmenu/media.xml                                     |   70 
 sw/uiconfig/swreport/popupmenu/oleobject.xml                                 |   62 
 sw/uiconfig/swreport/popupmenu/table.xml                                     |    1 
 sw/uiconfig/swreport/popupmenu/text.xml                                      |   53 
 sw/uiconfig/swriter/popupmenu/draw.xml                                       |   79 
 sw/uiconfig/swriter/popupmenu/drawtext.xml                                   |   27 
 sw/uiconfig/swriter/popupmenu/form.xml                                       |   74 
 sw/uiconfig/swriter/popupmenu/frame.xml                                      |   62 
 sw/uiconfig/swriter/popupmenu/graphic.xml                                    |   74 
 sw/uiconfig/swriter/popupmenu/media.xml                                      |   70 
 sw/uiconfig/swriter/popupmenu/oleobject.xml                                  |   62 
 sw/uiconfig/swriter/popupmenu/table.xml                                      |    1 
 sw/uiconfig/swriter/popupmenu/text.xml                                       |   53 
 sw/uiconfig/swxform/popupmenu/draw.xml                                       |   79 
 sw/uiconfig/swxform/popupmenu/drawtext.xml                                   |   27 
 sw/uiconfig/swxform/popupmenu/form.xml                                       |   74 
 sw/uiconfig/swxform/popupmenu/frame.xml                                      |   62 
 sw/uiconfig/swxform/popupmenu/graphic.xml                                    |   74 
 sw/uiconfig/swxform/popupmenu/media.xml                                      |   70 
 sw/uiconfig/swxform/popupmenu/oleobject.xml                                  |   62 
 sw/uiconfig/swxform/popupmenu/table.xml                                      |    1 
 sw/uiconfig/swxform/popupmenu/text.xml                                       |   53 
 93 files changed, 3172 insertions(+), 1700 deletions(-)

New commits:
commit 447c313586e9b36acff393feae15f5e1b63861ae
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Tue Jan 19 00:37:47 2016 +0200

    tdf#93837 Convert Writer context menus to xml
    
    Change-Id: I9bc4d5dbef899a31f485123ec841f8d6585a4529

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index e83e6fa..3c59b24 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4848,14 +4848,20 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Con~trol Properties...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Con~trol...</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>9</value>
         </prop>
       </node>
       <node oor:name=".uno:FormProperties" oor:op="replace">
-        <prop oor:name="ContextLabel" oor:type="xs:string">
+        <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">For~m Properties...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">For~m...</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>9</value>
         </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 6c8921b..70cc697 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3,6 +3,22 @@
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="WriterCommands" oor:package="org.openoffice.Office.UI">
   <node oor:name="UserInterface">
     <node oor:name="Commands">
+      <node oor:name=".uno:AddTextBox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Add Text Box</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RemoveTextBox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Remove Text Box</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:EditGlossary" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">AutoTe~xt...</value>
@@ -355,6 +371,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Caption...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Caption...</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -929,6 +948,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Properties...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Object...</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -2386,11 +2408,6 @@
           <value xml:lang="en-US">Paste ~Special</value>
         </prop>
       </node>
-      <node oor:name=".uno:AlignTextMenu" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">A~lignment</value>
-        </prop>
-      </node>
       <node oor:name=".uno:TableMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">T~able</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index c5d927f..ef6999a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -20,6 +20,41 @@
 <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/draw" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/drawtext" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape Text</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>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text Frame</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Image</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/media" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Media</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">OLE Object</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Print Preview</value>
@@ -30,6 +65,11 @@
           <value xml:lang="en-US">Table</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/text" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
           <value>0,0</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 3077b71..7e3f9c9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -20,6 +20,41 @@
 <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/draw" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/drawtext" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape Text</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>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text Frame</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Image</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/media" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Media</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">OLE Object</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Print Preview</value>
@@ -30,6 +65,11 @@
           <value xml:lang="en-US">Table</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/text" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
           <value>0,0</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index 60c42e5..0c6f004 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -20,6 +20,41 @@
 <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/draw" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/drawtext" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape Text</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>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text Frame</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Image</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/media" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Media</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">OLE Object</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Print Preview</value>
@@ -30,6 +65,11 @@
           <value xml:lang="en-US">Table</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/text" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
           <value>0,0</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 0218da2..4f3ee11 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -20,16 +20,46 @@
 <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/form" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Form Control</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text Frame</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Image</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">OLE Object</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Print Preview</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/source" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">HTML Source</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/table" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Table</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/text" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
           <value>0,0</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 7bbad92..f54246e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -20,6 +20,41 @@
 <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/draw" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/drawtext" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape Text</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>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text Frame</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Image</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/media" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Media</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">OLE Object</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Print Preview</value>
@@ -30,6 +65,11 @@
           <value xml:lang="en-US">Table</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/text" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
           <value>0,0</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 5a14108..b90debc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -20,6 +20,41 @@
 <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/draw" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/drawtext" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape Text</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>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text Frame</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Image</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/media" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Media</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">OLE Object</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Print Preview</value>
@@ -30,6 +65,11 @@
           <value xml:lang="en-US">Table</value>
         </prop>
       </node>
+      <node oor:name="private:resource/popupmenu/text" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
           <value>0,0</value>
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk
index 63261f3..6779f1d 100644
--- a/sw/UIConfig_sglobal.mk
+++ b/sw/UIConfig_sglobal.mk
@@ -14,8 +14,16 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sglobal,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sglobal,\
+	sw/uiconfig/sglobal/popupmenu/draw \
+	sw/uiconfig/sglobal/popupmenu/drawtext \
+	sw/uiconfig/sglobal/popupmenu/form \
+	sw/uiconfig/sglobal/popupmenu/frame \
+	sw/uiconfig/sglobal/popupmenu/graphic \
+	sw/uiconfig/sglobal/popupmenu/media \
+	sw/uiconfig/sglobal/popupmenu/oleobject \
 	sw/uiconfig/sglobal/popupmenu/preview \
 	sw/uiconfig/sglobal/popupmenu/table \
+	sw/uiconfig/sglobal/popupmenu/text \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/sglobal,\
diff --git a/sw/UIConfig_sweb.mk b/sw/UIConfig_sweb.mk
index a7e3ce1..daad88f 100644
--- a/sw/UIConfig_sweb.mk
+++ b/sw/UIConfig_sweb.mk
@@ -14,8 +14,14 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sweb,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\
+	sw/uiconfig/sweb/popupmenu/form \
+	sw/uiconfig/sweb/popupmenu/frame \
+	sw/uiconfig/sweb/popupmenu/graphic \
+	sw/uiconfig/sweb/popupmenu/oleobject \
 	sw/uiconfig/sweb/popupmenu/preview \
+	sw/uiconfig/sweb/popupmenu/source \
 	sw/uiconfig/sweb/popupmenu/table \
+	sw/uiconfig/sweb/popupmenu/text \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/sweb,\
diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk
index 0ed7fef..91474a4 100644
--- a/sw/UIConfig_swform.mk
+++ b/sw/UIConfig_swform.mk
@@ -14,8 +14,16 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swform,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swform,\
+	sw/uiconfig/swform/popupmenu/draw \
+	sw/uiconfig/swform/popupmenu/drawtext \
+	sw/uiconfig/swform/popupmenu/form \
+	sw/uiconfig/swform/popupmenu/frame \
+	sw/uiconfig/swform/popupmenu/graphic \
+	sw/uiconfig/swform/popupmenu/media \
+	sw/uiconfig/swform/popupmenu/oleobject \
 	sw/uiconfig/swform/popupmenu/preview \
 	sw/uiconfig/swform/popupmenu/table \
+	sw/uiconfig/swform/popupmenu/text \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/swform,\
diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk
index 97bd1e7..8f7a792 100644
--- a/sw/UIConfig_swreport.mk
+++ b/sw/UIConfig_swreport.mk
@@ -14,8 +14,16 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swreport,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swreport,\
+	sw/uiconfig/swreport/popupmenu/draw \
+	sw/uiconfig/swreport/popupmenu/drawtext \
+	sw/uiconfig/swreport/popupmenu/form \
+	sw/uiconfig/swreport/popupmenu/frame \
+	sw/uiconfig/swreport/popupmenu/graphic \
+	sw/uiconfig/swreport/popupmenu/media \
+	sw/uiconfig/swreport/popupmenu/oleobject \
 	sw/uiconfig/swreport/popupmenu/preview \
 	sw/uiconfig/swreport/popupmenu/table \
+	sw/uiconfig/swreport/popupmenu/text \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/swreport,\
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index b8bbef9..0adadbf 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -14,8 +14,16 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swriter,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\
+	sw/uiconfig/swriter/popupmenu/draw \
+	sw/uiconfig/swriter/popupmenu/drawtext \
+	sw/uiconfig/swriter/popupmenu/form \
+	sw/uiconfig/swriter/popupmenu/frame \
+	sw/uiconfig/swriter/popupmenu/graphic \
+	sw/uiconfig/swriter/popupmenu/media \
+	sw/uiconfig/swriter/popupmenu/oleobject \
 	sw/uiconfig/swriter/popupmenu/preview \
 	sw/uiconfig/swriter/popupmenu/table \
+	sw/uiconfig/swriter/popupmenu/text \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/swriter,\
diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk
index 05c455e..cebe2c4 100644
--- a/sw/UIConfig_swxform.mk
+++ b/sw/UIConfig_swxform.mk
@@ -14,8 +14,16 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swxform,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swxform,\
+	sw/uiconfig/swxform/popupmenu/draw \
+	sw/uiconfig/swxform/popupmenu/drawtext \
+	sw/uiconfig/swxform/popupmenu/form \
+	sw/uiconfig/swxform/popupmenu/frame \
+	sw/uiconfig/swxform/popupmenu/graphic \
+	sw/uiconfig/swxform/popupmenu/media \
+	sw/uiconfig/swxform/popupmenu/oleobject \
 	sw/uiconfig/swxform/popupmenu/preview \
 	sw/uiconfig/swxform/popupmenu/table \
+	sw/uiconfig/swxform/popupmenu/text \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/swxform,\
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 2595441..45af54e 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -47,7 +47,7 @@ SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell)
 
 void SwBezierShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAW_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("draw");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_BEZIER_TOOLBOX);
 }
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index e580ef5..add32b4 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -73,7 +73,7 @@ SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell)
 
 void SwDrawShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAW_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("draw");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_DRAW_TOOLBOX);
 
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 3d2ef44..b74b525 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -61,7 +61,7 @@ SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell)
 
 void SwDrawFormShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAWFORM_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("form");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
 }
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index e7de13d..2762c1b 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -85,7 +85,7 @@ SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell)
 
 void SwDrawTextShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRWTXT_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("drawtext");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_DRAW_TEXT_TOOLBOX);
 
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 17778e5..5160c0a 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -110,7 +110,7 @@ SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell)
 
 void SwFrameShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_FRM_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("frame");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_FRAME_TOOLBOX);
 }
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 901d9c4..edefcd8 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -111,7 +111,7 @@ SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell)
 
 void SwGrfShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_GRF_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("graphic");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_GRAFIK_TOOLBOX);
 }
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index 34473e4..baba8f1 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -73,7 +73,7 @@ SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell)
 
 void SwMediaShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_MEDIA_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("media");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_MEDIA_TOOLBOX);
 }
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index f14e39d..82dbaef 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -41,7 +41,7 @@ SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell)
 
 void SwOleShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_OLE_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("oleobject");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_OLE_TOOLBOX);
 }
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index d63b8cf..fa01b58 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -120,7 +120,7 @@ SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell)
 
 void SwTextShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TEXT_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("text");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
 
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 2cd03e4..9be7617 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -118,7 +118,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(SwSrcView, SfxViewShell)
 
 void SwSrcView::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_SRCVIEW_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("source");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             RID_WEBTOOLS_TOOLBOX);
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 844de03..225c033 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -43,7 +43,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(SwWebDrawFormShell, SwDrawFormShell)
 
 void SwWebDrawFormShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAWFORM_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("form");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
 }
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index 96ca336..befc4f6 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -41,7 +41,7 @@ SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell)
 
 void SwWebFrameShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_FRM_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("frame");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBFRAME_TOOLBOX);
 }
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 02433c9..717a3d6e0 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -45,7 +45,7 @@ SFX_IMPL_INTERFACE(SwWebGrfShell, SwGrfShell)
 
 void SwWebGrfShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_GRF_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("graphic");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBGRAPHIC_TOOLBOX);
 }
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index d6afecc..69e9e18 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -39,7 +39,7 @@ SFX_IMPL_INTERFACE(SwWebOleShell, SwOleShell)
 
 void SwWebOleShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_OLE_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("ole");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBOLE_TOOLBOX);
 }
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 4192095..319b9e8 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -47,7 +47,7 @@ SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell)
 
 void SwWebTextShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TEXT_POPUPMENU));
+    GetStaticInterface()->RegisterPopupMenu("text");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
 
diff --git a/sw/uiconfig/sglobal/popupmenu/draw.xml b/sw/uiconfig/sglobal/popupmenu/draw.xml
new file mode 100644
index 0000000..ccaa538
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/draw.xml
@@ -0,0 +1,79 @@
+<?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:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TextWrap"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AddTextBox"/>
+  <menu:menuitem menu:id=".uno:RemoveTextBox"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/drawtext.xml b/sw/uiconfig/sglobal/popupmenu/drawtext.xml
new file mode 100644
index 0000000..0dd2aed
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/drawtext.xml
@@ -0,0 +1,27 @@
+<?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:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/form.xml b/sw/uiconfig/sglobal/popupmenu/form.xml
new file mode 100644
index 0000000..a0f4cc9
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/form.xml
@@ -0,0 +1,74 @@
+<?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:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:NameGroup"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ControlProperties"/>
+  <menu:menuitem menu:id=".uno:FormProperties"/>
+  <menu:menuitem menu:id=".uno:ChangeControlType"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TextWrap"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/frame.xml b/sw/uiconfig/sglobal/popupmenu/frame.xml
new file mode 100644
index 0000000..f28337c
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/frame.xml
@@ -0,0 +1,62 @@
+<?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:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:FrameDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/graphic.xml b/sw/uiconfig/sglobal/popupmenu/graphic.xml
new file mode 100644
index 0000000..8c3c2ea
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/graphic.xml
@@ -0,0 +1,74 @@
+<?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:Crop"/>
+  <menu:menuitem menu:id=".uno:ExternalEdit"/>
+  <menu:menuitem menu:id=".uno:ChangePicture"/>
+  <menu:menuitem menu:id=".uno:CompressGraphic"/>
+  <menu:menuitem menu:id=".uno:SaveGraphic"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:RotateMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:RotateLeft"/>
+      <menu:menuitem menu:id=".uno:RotateRight"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:GraphicDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/media.xml b/sw/uiconfig/sglobal/popupmenu/media.xml
new file mode 100644
index 0000000..31de093
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/media.xml
@@ -0,0 +1,70 @@
+<?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:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TextWrap"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/oleobject.xml b/sw/uiconfig/sglobal/popupmenu/oleobject.xml
new file mode 100644
index 0000000..f28337c
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/oleobject.xml
@@ -0,0 +1,62 @@
+<?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:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:FrameDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/table.xml b/sw/uiconfig/sglobal/popupmenu/table.xml
index 02b6c42..624905f 100644
--- a/sw/uiconfig/sglobal/popupmenu/table.xml
+++ b/sw/uiconfig/sglobal/popupmenu/table.xml
@@ -65,6 +65,7 @@
   <menu:menuitem menu:id=".uno:EditFootnote"/>
   <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
   <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
+  <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
   <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
   <menu:menuitem menu:id=".uno:NextTrackedChange"/>
diff --git a/sw/uiconfig/sglobal/popupmenu/text.xml b/sw/uiconfig/sglobal/popupmenu/text.xml
new file mode 100644
index 0000000..a6a6021
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/text.xml
@@ -0,0 +1,53 @@
+<?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:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:NumberingStart"/>
+  <menu:menuitem menu:id=".uno:ContinueNumbering"/>
+  <menu:menuitem menu:id=".uno:IncrementLevel"/>
+  <menu:menuitem menu:id=".uno:DecrementLevel"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuitem menu:id=".uno:OutlineBullet"/>
+  <menu:menuitem menu:id=".uno:PageDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:UpdateCurIndex"/>
+  <menu:menuitem menu:id=".uno:EditCurIndex"/>
+  <menu:menuitem menu:id=".uno:RemoveTableOf"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FieldDialog"/>
+  <menu:menuitem menu:id=".uno:EditFootnote"/>
+  <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
+  <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
+  <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
+  <menu:menuitem menu:id=".uno:NextTrackedChange"/>
+  <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menuitem menu:id=".uno:EditHyperlink"/>
+  <menu:menuitem menu:id=".uno:CopyHyperlinkLocation"/>
+  <menu:menuitem menu:id=".uno:RemoveHyperlink"/>
+  <menu:menuitem menu:id=".uno:OpenSmartTagMenuOnCursor"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/form.xml b/sw/uiconfig/sweb/popupmenu/form.xml
new file mode 100644
index 0000000..a0f4cc9
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/form.xml
@@ -0,0 +1,74 @@
+<?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:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:NameGroup"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ControlProperties"/>
+  <menu:menuitem menu:id=".uno:FormProperties"/>
+  <menu:menuitem menu:id=".uno:ChangeControlType"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TextWrap"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/frame.xml b/sw/uiconfig/sweb/popupmenu/frame.xml
new file mode 100644
index 0000000..f28337c
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/frame.xml
@@ -0,0 +1,62 @@
+<?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:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:FrameDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/graphic.xml b/sw/uiconfig/sweb/popupmenu/graphic.xml
new file mode 100644
index 0000000..8c3c2ea
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/graphic.xml
@@ -0,0 +1,74 @@
+<?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:Crop"/>
+  <menu:menuitem menu:id=".uno:ExternalEdit"/>
+  <menu:menuitem menu:id=".uno:ChangePicture"/>
+  <menu:menuitem menu:id=".uno:CompressGraphic"/>
+  <menu:menuitem menu:id=".uno:SaveGraphic"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:RotateMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:RotateLeft"/>
+      <menu:menuitem menu:id=".uno:RotateRight"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:GraphicDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/oleobject.xml b/sw/uiconfig/sweb/popupmenu/oleobject.xml
new file mode 100644
index 0000000..f28337c
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/oleobject.xml
@@ -0,0 +1,62 @@
+<?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:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:FrameDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/source.xml b/sw/uiconfig/sweb/popupmenu/source.xml
new file mode 100644
index 0000000..2238c25
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/source.xml
@@ -0,0 +1,16 @@
+<?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:SourceView"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/table.xml b/sw/uiconfig/sweb/popupmenu/table.xml
index 02b6c42..624905f 100644
--- a/sw/uiconfig/sweb/popupmenu/table.xml
+++ b/sw/uiconfig/sweb/popupmenu/table.xml
@@ -65,6 +65,7 @@
   <menu:menuitem menu:id=".uno:EditFootnote"/>
   <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
   <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
+  <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
   <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
   <menu:menuitem menu:id=".uno:NextTrackedChange"/>
diff --git a/sw/uiconfig/sweb/popupmenu/text.xml b/sw/uiconfig/sweb/popupmenu/text.xml
new file mode 100644
index 0000000..1b267e1
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/text.xml
@@ -0,0 +1,49 @@
+<?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:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:NumberingStart"/>
+  <menu:menuitem menu:id=".uno:ContinueNumbering"/>
+  <menu:menuitem menu:id=".uno:IncrementLevel"/>
+  <menu:menuitem menu:id=".uno:DecrementLevel"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuitem menu:id=".uno:OutlineBullet"/>
+  <menu:menuitem menu:id=".uno:PageDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FieldDialog"/>
+  <menu:menuitem menu:id=".uno:EditFootnote"/>
+  <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
+  <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
+  <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
+  <menu:menuitem menu:id=".uno:NextTrackedChange"/>
+  <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menuitem menu:id=".uno:EditHyperlink"/>
+  <menu:menuitem menu:id=".uno:CopyHyperlinkLocation"/>
+  <menu:menuitem menu:id=".uno:RemoveHyperlink"/>
+  <menu:menuitem menu:id=".uno:OpenSmartTagMenuOnCursor"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/draw.xml b/sw/uiconfig/swform/popupmenu/draw.xml
new file mode 100644
index 0000000..ccaa538
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/draw.xml
@@ -0,0 +1,79 @@
+<?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:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TextWrap"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AddTextBox"/>
+  <menu:menuitem menu:id=".uno:RemoveTextBox"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/drawtext.xml b/sw/uiconfig/swform/popupmenu/drawtext.xml
new file mode 100644
index 0000000..0dd2aed
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/drawtext.xml
@@ -0,0 +1,27 @@
+<?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:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/form.xml b/sw/uiconfig/swform/popupmenu/form.xml
new file mode 100644
index 0000000..a0f4cc9
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/form.xml
@@ -0,0 +1,74 @@
+<?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:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:NameGroup"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ControlProperties"/>
+  <menu:menuitem menu:id=".uno:FormProperties"/>
+  <menu:menuitem menu:id=".uno:ChangeControlType"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TextWrap"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/frame.xml b/sw/uiconfig/swform/popupmenu/frame.xml
new file mode 100644
index 0000000..f28337c
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/frame.xml
@@ -0,0 +1,62 @@
+<?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:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:FrameDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/graphic.xml b/sw/uiconfig/swform/popupmenu/graphic.xml
new file mode 100644
index 0000000..8c3c2ea
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/graphic.xml
@@ -0,0 +1,74 @@
+<?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:Crop"/>
+  <menu:menuitem menu:id=".uno:ExternalEdit"/>
+  <menu:menuitem menu:id=".uno:ChangePicture"/>
+  <menu:menuitem menu:id=".uno:CompressGraphic"/>
+  <menu:menuitem menu:id=".uno:SaveGraphic"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:RotateMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:RotateLeft"/>
+      <menu:menuitem menu:id=".uno:RotateRight"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:GraphicDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/media.xml b/sw/uiconfig/swform/popupmenu/media.xml
new file mode 100644
index 0000000..31de093
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/media.xml
@@ -0,0 +1,70 @@
+<?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:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TextWrap"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/oleobject.xml b/sw/uiconfig/swform/popupmenu/oleobject.xml
new file mode 100644
index 0000000..f28337c
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/oleobject.xml
@@ -0,0 +1,62 @@
+<?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:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapLeft"/>
+      <menu:menuitem menu:id=".uno:WrapRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:ContourDialog"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AlignFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignTop"/>
+      <menu:menuitem menu:id=".uno:AlignVerticalCenter"/>
+      <menu:menuitem menu:id=".uno:AlignBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeFrameMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuitem menu:id=".uno:FrameDialog"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/table.xml b/sw/uiconfig/swform/popupmenu/table.xml
index 02b6c42..624905f 100644
--- a/sw/uiconfig/swform/popupmenu/table.xml
+++ b/sw/uiconfig/swform/popupmenu/table.xml
@@ -65,6 +65,7 @@
   <menu:menuitem menu:id=".uno:EditFootnote"/>
   <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
   <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
+  <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
   <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
   <menu:menuitem menu:id=".uno:NextTrackedChange"/>
diff --git a/sw/uiconfig/swform/popupmenu/text.xml b/sw/uiconfig/swform/popupmenu/text.xml
new file mode 100644
index 0000000..a6a6021
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/text.xml
@@ -0,0 +1,53 @@
+<?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:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:NumberingStart"/>
+  <menu:menuitem menu:id=".uno:ContinueNumbering"/>
+  <menu:menuitem menu:id=".uno:IncrementLevel"/>
+  <menu:menuitem menu:id=".uno:DecrementLevel"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuitem menu:id=".uno:OutlineBullet"/>
+  <menu:menuitem menu:id=".uno:PageDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:UpdateCurIndex"/>
+  <menu:menuitem menu:id=".uno:EditCurIndex"/>
+  <menu:menuitem menu:id=".uno:RemoveTableOf"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FieldDialog"/>
+  <menu:menuitem menu:id=".uno:EditFootnote"/>
+  <menu:menuitem menu:id=".uno:IndexEntryDialog"/>
+  <menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
+  <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
+  <menu:menuitem menu:id=".uno:NextTrackedChange"/>
+  <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menuitem menu:id=".uno:EditHyperlink"/>
+  <menu:menuitem menu:id=".uno:CopyHyperlinkLocation"/>
+  <menu:menuitem menu:id=".uno:RemoveHyperlink"/>
+  <menu:menuitem menu:id=".uno:OpenSmartTagMenuOnCursor"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swreport/popupmenu/draw.xml b/sw/uiconfig/swreport/popupmenu/draw.xml
new file mode 100644
index 0000000..ccaa538
--- /dev/null
+++ b/sw/uiconfig/swreport/popupmenu/draw.xml
@@ -0,0 +1,79 @@
+<?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:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToPara" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorAtChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToChar" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToFrame" menu:style="radio"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WrapMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:WrapOff"/>
+      <menu:menuitem menu:id=".uno:WrapOn"/>
+      <menu:menuitem menu:id=".uno:WrapIdeal"/>
+      <menu:menuitem menu:id=".uno:WrapThrough"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WrapContour"/>
+      <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TextWrap"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AddTextBox"/>
+  <menu:menuitem menu:id=".uno:RemoveTextBox"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swreport/popupmenu/drawtext.xml b/sw/uiconfig/swreport/popupmenu/drawtext.xml
new file mode 100644
index 0000000..0dd2aed
--- /dev/null
+++ b/sw/uiconfig/swreport/popupmenu/drawtext.xml
@@ -0,0 +1,27 @@
+<?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:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>

... etc. - the rest is truncated
