[Libreoffice-commits] core.git: 4 commits - compilerplugins/clang cui/source framework/source include/sfx2 include/vcl officecfg/registry sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk sfx2/AllLangResTarget_sfx2.mk sfx2/inc sfx2/Library_sfx.mk sfx2/source svx/inc svx/source sw/source vcl/source

Maxim Monastirsky momonasmon at gmail.com
Sun Feb 28 07:12:41 UTC 2016


 compilerplugins/clang/store/constantfunction.cxx                         |    2 
 cui/source/customize/cfg.cxx                                             |    1 
 framework/source/uielement/menubarmanager.cxx                            |   16 
 framework/source/uielement/toolbarmanager.cxx                            |    7 
 framework/source/uielement/uicommanddescription.cxx                      |   12 
 include/sfx2/app.hxx                                                     |    2 
 include/sfx2/dispatch.hxx                                                |    1 
 include/sfx2/mnuitem.hxx                                                 |  124 -
 include/sfx2/mnumgr.hxx                                                  |   84 
 include/sfx2/module.hxx                                                  |    2 
 include/vcl/commandinfoprovider.hxx                                      |    3 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |  282 ++
 officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs          |    5 
 sd/UIConfig_sdraw.mk                                                     |   26 
 sd/UIConfig_simpress.mk                                                  |   28 
 sd/source/ui/annotations/annotationwindow.cxx                            |    1 
 sd/source/ui/app/sddll.cxx                                               |    5 
 sd/source/ui/dlg/LayerTabBar.cxx                                         |    2 
 sd/source/ui/sidebar/MasterPagesSelector.cxx                             |    1 
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx            |   44 
 sd/source/ui/view/drviews4.cxx                                           |   77 
 sd/source/ui/view/drvwshrg.cxx                                           |    4 
 sd/source/ui/view/outlnvsh.cxx                                           |    4 
 sd/source/ui/view/tabcontr.cxx                                           |    5 
 sd/uiconfig/sdraw/popupmenu/3dobject.xml                                 |   66 
 sd/uiconfig/sdraw/popupmenu/3dscene.xml                                  |   59 
 sd/uiconfig/sdraw/popupmenu/3dscene2.xml                                 |   59 
 sd/uiconfig/sdraw/popupmenu/bezier.xml                                   |   26 
 sd/uiconfig/sdraw/popupmenu/connector.xml                                |   64 
 sd/uiconfig/sdraw/popupmenu/curve.xml                                    |   74 
 sd/uiconfig/sdraw/popupmenu/draw.xml                                     |   66 
 sd/uiconfig/sdraw/popupmenu/drawtext.xml                                 |   45 
 sd/uiconfig/sdraw/popupmenu/form.xml                                     |   50 
 sd/uiconfig/sdraw/popupmenu/gluepoint.xml                                |   27 
 sd/uiconfig/sdraw/popupmenu/graphic.xml                                  |   71 
 sd/uiconfig/sdraw/popupmenu/group.xml                                    |   64 
 sd/uiconfig/sdraw/popupmenu/layertab.xml                                 |   15 
 sd/uiconfig/sdraw/popupmenu/line.xml                                     |   66 
 sd/uiconfig/sdraw/popupmenu/measure.xml                                  |   74 
 sd/uiconfig/sdraw/popupmenu/media.xml                                    |   43 
 sd/uiconfig/sdraw/popupmenu/multiselect.xml                              |   80 
 sd/uiconfig/sdraw/popupmenu/oleobject.xml                                |   66 
 sd/uiconfig/sdraw/popupmenu/outlinetext.xml                              |   65 
 sd/uiconfig/sdraw/popupmenu/page.xml                                     |   46 
 sd/uiconfig/sdraw/popupmenu/pagepane.xml                                 |   18 
 sd/uiconfig/sdraw/popupmenu/pagepanenosel.xml                            |   16 
 sd/uiconfig/sdraw/popupmenu/pagetab.xml                                  |   18 
 sd/uiconfig/sdraw/popupmenu/table.xml                                    |   90 
 sd/uiconfig/sdraw/popupmenu/tabletext.xml                                |   72 
 sd/uiconfig/sdraw/popupmenu/textbox.xml                                  |   64 
 sd/uiconfig/simpress/popupmenu/3dobject.xml                              |   68 
 sd/uiconfig/simpress/popupmenu/3dscene.xml                               |   61 
 sd/uiconfig/simpress/popupmenu/3dscene2.xml                              |   61 
 sd/uiconfig/simpress/popupmenu/bezier.xml                                |   26 
 sd/uiconfig/simpress/popupmenu/connector.xml                             |   66 
 sd/uiconfig/simpress/popupmenu/curve.xml                                 |   76 
 sd/uiconfig/simpress/popupmenu/draw.xml                                  |   68 
 sd/uiconfig/simpress/popupmenu/drawtext.xml                              |   45 
 sd/uiconfig/simpress/popupmenu/form.xml                                  |   50 
 sd/uiconfig/simpress/popupmenu/gluepoint.xml                             |   27 
 sd/uiconfig/simpress/popupmenu/graphic.xml                               |   73 
 sd/uiconfig/simpress/popupmenu/group.xml                                 |   66 
 sd/uiconfig/simpress/popupmenu/line.xml                                  |   68 
 sd/uiconfig/simpress/popupmenu/measure.xml                               |   76 
 sd/uiconfig/simpress/popupmenu/media.xml                                 |   45 
 sd/uiconfig/simpress/popupmenu/multiselect.xml                           |   82 
 sd/uiconfig/simpress/popupmenu/oleobject.xml                             |   68 
 sd/uiconfig/simpress/popupmenu/outline.xml                               |   33 
 sd/uiconfig/simpress/popupmenu/outlinetext.xml                           |   67 
 sd/uiconfig/simpress/popupmenu/page.xml                                  |   49 
 sd/uiconfig/simpress/popupmenu/pagepane.xml                              |   26 
 sd/uiconfig/simpress/popupmenu/pagepanemaster.xml                        |   20 
 sd/uiconfig/simpress/popupmenu/pagepanenosel.xml                         |   16 
 sd/uiconfig/simpress/popupmenu/pagepanenoselmaster.xml                   |   16 
 sd/uiconfig/simpress/popupmenu/pagetab.xml                               |   19 
 sd/uiconfig/simpress/popupmenu/table.xml                                 |   92 
 sd/uiconfig/simpress/popupmenu/tabletext.xml                             |   72 
 sd/uiconfig/simpress/popupmenu/textbox.xml                               |   66 
 sfx2/AllLangResTarget_sfx2.mk                                            |    1 
 sfx2/Library_sfx.mk                                                      |    4 
 sfx2/inc/pch/precompiled_sfx.hxx                                         |    2 
 sfx2/source/appl/app.cxx                                                 |   10 
 sfx2/source/appl/appdata.cxx                                             |    1 
 sfx2/source/appl/appinit.cxx                                             |    2 
 sfx2/source/appl/appmain.cxx                                             |    1 
 sfx2/source/appl/appmisc.cxx                                             |    1 
 sfx2/source/appl/appquit.cxx                                             |    2 
 sfx2/source/appl/appreg.cxx                                              |   25 
 sfx2/source/appl/module.cxx                                              |   36 
 sfx2/source/appl/sfxhelp.cxx                                             |   19 
 sfx2/source/control/ctrlfactoryimpl.cxx                                  |   20 
 sfx2/source/control/dispatch.cxx                                         |   15 
 sfx2/source/control/objface.cxx                                          |   15 
 sfx2/source/control/shell.cxx                                            |    1 
 sfx2/source/dialog/splitwin.cxx                                          |    3 
 sfx2/source/doc/docfac.cxx                                               |    1 
 sfx2/source/inc/appdata.hxx                                              |    1 
 sfx2/source/inc/ctrlfactoryimpl.hxx                                      |   15 
 sfx2/source/inc/virtmenu.hxx                                             |  103 
 sfx2/source/menu/menu.hrc                                                |   36 
 sfx2/source/menu/menu.src                                                |   83 
 sfx2/source/menu/mnuitem.cxx                                             |  309 --
 sfx2/source/menu/mnumgr.cxx                                              |  322 ---
 sfx2/source/menu/thessubmenu.cxx                                         |  139 -
 sfx2/source/menu/thessubmenu.hxx                                         |   61 
 sfx2/source/menu/virtmenu.cxx                                            | 1057 ----------
 sfx2/source/toolbox/tbxitem.cxx                                          |    2 
 svx/inc/pch/precompiled_svx.hxx                                          |    1 
 svx/source/form/fmobjfac.cxx                                             |    1 
 svx/source/form/fmshimp.cxx                                              |   75 
 svx/source/inc/fmshimp.hxx                                               |   20 
 sw/source/uibase/ribbar/tbxanchr.cxx                                     |    1 
 sw/source/uibase/ribbar/workctrl.cxx                                     |    1 
 vcl/source/helper/commandinfoprovider.cxx                                |    8 
 114 files changed, 3327 insertions(+), 2711 deletions(-)

New commits:
commit b354775b377d29afe63c4b15cb4574a398dca007
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Feb 28 03:01:57 2016 +0200

    tdf#93837 sd: Initial import of context menu xml files
    
    Lots of copy-paste there, will look at it later.
    
    Change-Id: I966679068ba159f481e2add8ab7b6f5384e7e22e

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 68c7901..cfea8df 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -49,7 +49,7 @@
       </node>
       <node oor:name=".uno:RenameLayer" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Rename</value>
+          <value xml:lang="en-US">~Rename Layer</value>
         </prop>
       </node>
       <node oor:name=".uno:Presentation" oor:op="replace">
@@ -821,11 +821,20 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Rulers</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">View ~Rulers</value>
+        </prop>
       </node>
       <node oor:name=".uno:InsertLayer" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Layer</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Layer...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Insert Layer...</value>
+        </prop>
       </node>
       <node oor:name=".uno:ModifyPage" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -837,8 +846,14 @@
       </node>
       <node oor:name=".uno:ModifyLayer" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Modify Layer</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Layer...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Modify Layer...</value>
+        </prop>
       </node>
       <node oor:name=".uno:PageMode" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -993,7 +1008,7 @@
       </node>
       <node oor:name=".uno:DeleteLayer" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete</value>
+          <value xml:lang="en-US">Delete Layer</value>
         </prop>
       </node>
       <node oor:name=".uno:Dismantle" oor:op="replace">
@@ -1772,8 +1787,14 @@
       </node>
       <node oor:name=".uno:InsertRowDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Rows</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Rows...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Rows...</value>
+        </prop>
       </node>
       <node oor:name=".uno:InsertColumns" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1785,8 +1806,14 @@
       </node>
       <node oor:name=".uno:InsertColumnDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Columns</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Columns...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Columns...</value>
+        </prop>
       </node>
       <node oor:name=".uno:DeleteRows" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1795,6 +1822,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Rows</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Delete Row</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -1806,6 +1836,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Columns</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Delete Column</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -1828,6 +1861,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Columns</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Select Column</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -1839,6 +1875,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Rows</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Select Rows</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -2234,6 +2273,36 @@
           <value xml:lang="en-US">Slide Layout</value>
         </prop>
       </node>
+      <node oor:name=".uno:PageMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Pag~e</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SlideFeaturesMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Slid~e Features</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CellMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Cell</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RowMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Row</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ColumnMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Colu~mn</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ModifyPresentationObject" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Presentation ~Object...</value>
+        </prop>
+      </node>
     </node>
   </node>
 </oor:component-data>
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index dc0f1e1..b166919 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -14,7 +14,33 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sdraw,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\
+	sd/uiconfig/sdraw/popupmenu/3dobject \
+	sd/uiconfig/sdraw/popupmenu/3dscene2 \
+	sd/uiconfig/sdraw/popupmenu/3dscene \
+	sd/uiconfig/sdraw/popupmenu/bezier \
+	sd/uiconfig/sdraw/popupmenu/connector \
+	sd/uiconfig/sdraw/popupmenu/curve \
+	sd/uiconfig/sdraw/popupmenu/drawtext \
+	sd/uiconfig/sdraw/popupmenu/draw \
+	sd/uiconfig/sdraw/popupmenu/form \
 	sd/uiconfig/sdraw/popupmenu/formrichtext \
+	sd/uiconfig/sdraw/popupmenu/gluepoint \
+	sd/uiconfig/sdraw/popupmenu/graphic \
+	sd/uiconfig/sdraw/popupmenu/group \
+	sd/uiconfig/sdraw/popupmenu/layertab \
+	sd/uiconfig/sdraw/popupmenu/line \
+	sd/uiconfig/sdraw/popupmenu/measure \
+	sd/uiconfig/sdraw/popupmenu/media \
+	sd/uiconfig/sdraw/popupmenu/multiselect \
+	sd/uiconfig/sdraw/popupmenu/oleobject \
+	sd/uiconfig/sdraw/popupmenu/outlinetext \
+	sd/uiconfig/sdraw/popupmenu/pagepanenosel \
+	sd/uiconfig/sdraw/popupmenu/pagepane \
+	sd/uiconfig/sdraw/popupmenu/pagetab \
+	sd/uiconfig/sdraw/popupmenu/page \
+	sd/uiconfig/sdraw/popupmenu/tabletext \
+	sd/uiconfig/sdraw/popupmenu/table \
+	sd/uiconfig/sdraw/popupmenu/textbox \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/sdraw,\
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 7adf181..b880ca7 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -14,7 +14,35 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/simpress,\
 ))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/simpress,\
+	sd/uiconfig/simpress/popupmenu/3dobject \
+	sd/uiconfig/simpress/popupmenu/3dscene2 \
+	sd/uiconfig/simpress/popupmenu/3dscene \
+	sd/uiconfig/simpress/popupmenu/bezier \
+	sd/uiconfig/simpress/popupmenu/connector \
+	sd/uiconfig/simpress/popupmenu/curve \
+	sd/uiconfig/simpress/popupmenu/drawtext \
+	sd/uiconfig/simpress/popupmenu/draw \
+	sd/uiconfig/simpress/popupmenu/form \
 	sd/uiconfig/simpress/popupmenu/formrichtext \
+	sd/uiconfig/simpress/popupmenu/gluepoint \
+	sd/uiconfig/simpress/popupmenu/graphic \
+	sd/uiconfig/simpress/popupmenu/group \
+	sd/uiconfig/simpress/popupmenu/line \
+	sd/uiconfig/simpress/popupmenu/measure \
+	sd/uiconfig/simpress/popupmenu/media \
+	sd/uiconfig/simpress/popupmenu/multiselect \
+	sd/uiconfig/simpress/popupmenu/oleobject \
+	sd/uiconfig/simpress/popupmenu/outlinetext \
+	sd/uiconfig/simpress/popupmenu/outline \
+	sd/uiconfig/simpress/popupmenu/pagepanemaster \
+	sd/uiconfig/simpress/popupmenu/pagepanenoselmaster \
+	sd/uiconfig/simpress/popupmenu/pagepanenosel \
+	sd/uiconfig/simpress/popupmenu/pagepane \
+	sd/uiconfig/simpress/popupmenu/pagetab \
+	sd/uiconfig/simpress/popupmenu/page \
+	sd/uiconfig/simpress/popupmenu/tabletext \
+	sd/uiconfig/simpress/popupmenu/table \
+	sd/uiconfig/simpress/popupmenu/textbox \
 ))
 
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/simpress,\
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index ed3f694..caf7ce5 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -154,7 +154,7 @@ void  LayerTabBar::Command(const CommandEvent& rCEvt)
     if ( rCEvt.GetCommand() == CommandEventId::ContextMenu )
     {
         SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-        pDispatcher->ExecutePopup(SdResId(RID_LAYERTAB_POPUP));
+        pDispatcher->ExecutePopup("layertab");
     }
 }
 
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 41ef617..07f0803 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -319,42 +319,25 @@ bool SlideSorterController::Command (
         case CommandEventId::ContextMenu:
         {
             SdPage* pPage = nullptr;
-            sal_uInt16 nPopupId;
+            OUString aPopupId;
 
             model::PageEnumeration aSelectedPages (
                 PageEnumerationProvider::CreateSelectedPagesEnumeration(mrModel));
             if (aSelectedPages.HasMoreElements())
                 pPage = aSelectedPages.GetNextElement()->GetPage();
 
-            // Choose the popup menu depending on a) the type of the main
-            // view shell, b) the edit mode, and c) on whether the selection
-            // is empty or not.
-            ViewShell::ShellType eMainViewShellType (ViewShell::ST_NONE);
-            std::shared_ptr<ViewShell> pMainViewShell (
-                pViewShell->GetViewShellBase().GetMainViewShell());
-            if (pMainViewShell.get() != nullptr)
-                eMainViewShellType = pMainViewShell->GetShellType();
-            switch (eMainViewShellType)
+            if (mrModel.GetEditMode() == EM_PAGE)
             {
-                case ViewShell::ST_DRAW:
-                    if (pPage != nullptr)
-                        nPopupId = RID_SLIDE_SORTER_DRAW_SEL_POPUP;
-                    else
-                        nPopupId = RID_SLIDE_SORTER_DRAW_NOSEL_POPUP;
-                    break;
-
-                default:
-                    if (mrModel.GetEditMode() == EM_PAGE)
-                        if (pPage != nullptr)
-                            nPopupId = RID_SLIDE_SORTER_IMPRESS_SEL_POPUP;
-                        else
-                            nPopupId = RID_SLIDE_SORTER_IMPRESS_NOSEL_POPUP;
-                    else
-                        if (pPage != nullptr)
-                            nPopupId = RID_SLIDE_SORTER_MASTER_SEL_POPUP;
-                        else
-                            nPopupId = RID_SLIDE_SORTER_MASTER_NOSEL_POPUP;
+                if (pPage != nullptr)
+                    aPopupId = "pagepane";
+                else
+                    aPopupId = "pagepanenosel";
             }
+            else if (pPage != nullptr)
+                aPopupId = "pagepanemaster";
+            else
+                aPopupId = "pagepagenoselmaster";
+
             std::unique_ptr<InsertionIndicatorHandler::ForceShowContext> pContext;
             if (pPage == nullptr)
             {
@@ -404,10 +387,7 @@ bool SlideSorterController::Command (
                 SfxDispatcher* pDispatcher = pViewShell->GetDispatcher();
                 if (pDispatcher != nullptr)
                 {
-                    pDispatcher->ExecutePopup(
-                        SdResId(nPopupId),
-                        pWindow,
-                        &aMenuLocation);
+                    pDispatcher->ExecutePopup( aPopupId, pWindow, &aMenuLocation );
                     mrSlideSorter.GetView().UpdatePageUnderMouse();
                     ::rtl::Reference<SelectionFunction> pFunction(GetCurrentSelectionFunction());
                     if (pFunction.is())
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 93e698e..76ef60a 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -509,8 +509,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
         else if( rCEvt.GetCommand() == CommandEventId::ContextMenu && !bNativeShow &&
                  pWin != nullptr && !mpDrawView->IsAction() && !SD_MOD()->GetWaterCan() )
         {
-            sal_uInt16 nSdResId = 0;          // ResourceID for popup menu
-            bool bGraphicShell = dynamic_cast< const GraphicViewShell *>( this ) !=  nullptr;
+            OUString aPopupId; // Resource name for popup menu
 
             // is there a snap object under the cursor?
             SdrPageView* pPV;
@@ -530,7 +529,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
             // helper line
             if ( mpDrawView->PickHelpLine( aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) )
             {
-                nSdResId = RID_DRAW_SNAPOBJECT_POPUP;
                 ShowSnapLineContextMenu(*pPV, nHelpLine, rCEvt.GetMousePosPixel());
                 return;
             }
@@ -538,7 +536,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
             else if( mpDrawView->PickGluePoint( aMPos, pObj, nPickId, pPV ) &&
                      mpDrawView->IsGluePointMarked( pObj, nPickId ) )
             {
-                nSdResId = RID_DRAW_GLUEPOINT_POPUP;
+                aPopupId = "gluepoint";
             }
             // field command?
             else if( pFldItem && (nullptr != dynamic_cast< const SvxDateField *>( pFldItem->GetField() ) ||
@@ -597,7 +595,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                     pObj = mpDrawView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
                     if( HasCurrentFunction(SID_BEZIER_EDIT) && (dynamic_cast< SdrPathObj * >( pObj ) != nullptr ) )
                     {
-                        nSdResId = RID_BEZIER_POPUP;
+                        aPopupId = "bezier";
                     }
                     else
                     {
@@ -633,11 +631,11 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                                 {
                                     if( (pObj->GetObjInventor() == SdrInventor) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
                                     {
-                                        nSdResId = RID_DRAW_TABLEOBJ_INSIDE_POPUP;
+                                        aPopupId = "tabletext";
                                     }
                                     else
                                     {
-                                        nSdResId = RID_DRAW_TEXTOBJ_INSIDE_POPUP;
+                                        aPopupId = "drawtext";
                                     }
                                 }
                             }
@@ -652,37 +650,31 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                                 switch ( nId )
                                 {
                                     case OBJ_OUTLINETEXT:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_OUTLINETEXTOBJ_POPUP :
-                                                                    RID_DRAW_OUTLINETEXTOBJ_POPUP;
+                                        aPopupId = "outlinetext";
                                         break;
 
                                     case OBJ_CAPTION:
                                     case OBJ_TITLETEXT:
                                     case OBJ_TEXT:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_TEXTOBJ_POPUP :
-                                                                    RID_DRAW_TEXTOBJ_POPUP;
+                                        aPopupId = "textbox";
                                         break;
 
                                     case OBJ_PATHLINE:
                                     case OBJ_PLIN:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_POLYLINEOBJ_POPUP :
-                                                                    RID_DRAW_POLYLINEOBJ_POPUP;
+                                        aPopupId = "curve";
                                         break;
 
                                     case OBJ_FREELINE:
-                                    case OBJ_EDGE:      // Connector
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_EDGEOBJ_POPUP :
-                                                                    RID_DRAW_EDGEOBJ_POPUP;
+                                    case OBJ_EDGE:
+                                        aPopupId = "connector";
                                         break;
 
                                     case OBJ_LINE:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_LINEOBJ_POPUP :
-                                                                    RID_DRAW_LINEOBJ_POPUP;
+                                        aPopupId = "line";
                                         break;
 
                                     case OBJ_MEASURE:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_MEASUREOBJ_POPUP :
-                                                                    RID_DRAW_MEASUREOBJ_POPUP;
+                                        aPopupId = "measure";
                                         break;
 
                                     case OBJ_RECT:
@@ -693,36 +685,26 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                                     case OBJ_SECT:
                                     case OBJ_CARC:
                                     case OBJ_CCUT:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_GEOMOBJ_POPUP :
-                                                                    RID_DRAW_GEOMOBJ_POPUP;
-                                        break;
-
                                     case OBJ_CUSTOMSHAPE:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_CUSTOMSHAPE_POPUP :
-                                                                    RID_DRAW_CUSTOMSHAPE_POPUP;
+                                        aPopupId = "draw";
                                         break;
 
                                     case OBJ_GRUP:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_GROUPOBJ_POPUP :
-                                                                    RID_DRAW_GROUPOBJ_POPUP;
+                                        aPopupId = "group";
                                         break;
 
                                     case OBJ_GRAF:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_GRAPHIC_POPUP :
-                                                                    RID_DRAW_GRAPHIC_POPUP;
+                                        aPopupId = "graphic";
                                         break;
 
                                     case OBJ_OLE2:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_OLE2_POPUP :
-                                                                    RID_DRAW_OLE2_POPUP;
+                                        aPopupId = "oleobject";
                                         break;
                                     case OBJ_MEDIA:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_MEDIA_POPUP :
-                                                                    RID_DRAW_MEDIA_POPUP;
+                                        aPopupId = "media";
                                         break;
                                     case OBJ_TABLE:
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_TABLE_POPUP :
-                                                                    RID_DRAW_TABLE_POPUP;
+                                        aPopupId = "table";
                                         break;
                                 }
                             }
@@ -731,19 +713,16 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                                 if( nId == E3D_POLYSCENE_ID || nId == E3D_SCENE_ID )
                                 {
                                     if( !mpDrawView->IsGroupEntered() )
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_3DSCENE_POPUP :
-                                                                RID_DRAW_3DSCENE_POPUP;
+                                        aPopupId = "3dscene";
                                     else
-                                        nSdResId = bGraphicShell ? RID_GRAPHIC_3DSCENE2_POPUP :
-                                                                RID_DRAW_3DSCENE2_POPUP;
+                                        aPopupId = "3dscene2";
                                 }
                                 else
-                                    nSdResId = bGraphicShell ? RID_GRAPHIC_3DOBJ_POPUP :
-                                                                RID_DRAW_3DOBJ_POPUP;
+                                    aPopupId = "3dobject";
                             }
                             else if( nInv == FmFormInventor )
                             {
-                                nSdResId = RID_FORM_CONTROL_POPUP;
+                                aPopupId = "form";
                             }
                         }
                     }
@@ -753,24 +732,22 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                 else if (mpDrawView->AreObjectsMarked() &&
                     mpDrawView->GetMarkedObjectList().GetMarkCount() > 1 )
                 {
-                    nSdResId = bGraphicShell ? RID_GRAPHIC_MULTISELECTION_POPUP :
-                                                RID_DRAW_MULTISELECTION_POPUP;
+                    aPopupId = "multiselect";
                 }
 
                 // nothing selected
                 else
                 {
-                    nSdResId = bGraphicShell ? RID_GRAPHIC_NOSEL_POPUP :
-                                                RID_DRAW_NOSEL_POPUP;
+                    aPopupId = "page";
                 }
             }
             // show Popup-Menu
-            if (nSdResId)
+            if (!aPopupId.isEmpty())
             {
                 GetActiveWindow()->ReleaseMouse();
 
                 if(rCEvt.IsMouseEvent())
-                    GetViewFrame()->GetDispatcher()->ExecutePopup(SdResId(nSdResId));
+                    GetViewFrame()->GetDispatcher()->ExecutePopup( aPopupId );
                 else
                 {
                     //don't open contextmenu at mouse position if not opened via mouse
@@ -798,7 +775,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                     }
 
                     //open context menu at that point
-                    GetViewFrame()->GetDispatcher()->ExecutePopup(SdResId(nSdResId),GetActiveWindow(),&aMenuPos);
+                    GetViewFrame()->GetDispatcher()->ExecutePopup( aPopupId, GetActiveWindow(), &aMenuPos );
                 }
                 mbMousePosFreezed = false;
             }
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index bf4f097..7b16b72 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -62,7 +62,7 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell)
 
 void DrawViewShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP));
+    GetStaticInterface()->RegisterPopupMenu("drawtext");
 
     GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
 
@@ -86,7 +86,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell)
 
 void GraphicViewShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP));
+    GetStaticInterface()->RegisterPopupMenu("drawtext");
 
     GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
 
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index cdf4716..adf70d3 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -110,7 +110,7 @@ SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell)
 
 void OutlineViewShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(SdResId(RID_OUTLINE_POPUP));
+    GetStaticInterface()->RegisterPopupMenu("outline");
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
                                             RID_OUTLINE_TOOLBOX);
@@ -1377,7 +1377,7 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin )
         }
         else
         {
-           GetViewFrame()->GetDispatcher()->ExecutePopup(SdResId(RID_OUTLINE_POPUP));
+           GetViewFrame()->GetDispatcher()->ExecutePopup("outline");
         }
     }
     else
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index bb7c51d..e572516 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -279,11 +279,8 @@ void TabControl::Command(const CommandEvent& rCEvt)
 {
     if ( rCEvt.GetCommand() == CommandEventId::ContextMenu )
     {
-        bool bGraphicShell = dynamic_cast< GraphicViewShell *>( pDrViewSh ) !=  nullptr;
-        sal_uInt16 nResId = bGraphicShell ? RID_GRAPHIC_PAGETAB_POPUP :
-                                        RID_DRAW_PAGETAB_POPUP;
         SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-        pDispatcher->ExecutePopup( SdResId( nResId ) );
+        pDispatcher->ExecutePopup("pagetab");
     }
 }
 
diff --git a/sd/uiconfig/sdraw/popupmenu/3dobject.xml b/sd/uiconfig/sdraw/popupmenu/3dobject.xml
new file mode 100644
index 0000000..f8d64c1
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/3dobject.xml
@@ -0,0 +1,66 @@
+<?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: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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Window3D"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/3dscene.xml b/sd/uiconfig/sdraw/popupmenu/3dscene.xml
new file mode 100644
index 0000000..34b8dc5
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/3dscene.xml
@@ -0,0 +1,59 @@
+<?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:Window3D"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EnterGroup"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/3dscene2.xml b/sd/uiconfig/sdraw/popupmenu/3dscene2.xml
new file mode 100644
index 0000000..af99b45
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/3dscene2.xml
@@ -0,0 +1,59 @@
+<?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: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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EnterGroup"/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Window3D"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/bezier.xml b/sd/uiconfig/sdraw/popupmenu/bezier.xml
new file mode 100644
index 0000000..4136702
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/bezier.xml
@@ -0,0 +1,26 @@
+<?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:ToggleObjectBezierMode"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:BezierMove"/>
+  <menu:menuitem menu:id=".uno:BezierInsert"/>
+  <menu:menuitem menu:id=".uno:BezierDelete"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:BezierClose"/>
+  <menu:menuitem menu:id=".uno:BezierCutLine"/>
+  <menu:menuitem menu:id=".uno:BezierConvert"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:BezierEdge"/>
+  <menu:menuitem menu:id=".uno:BezierSmooth"/>
+  <menu:menuitem menu:id=".uno:BezierSymmetric"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:BezierEliminatePoints"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/connector.xml b/sd/uiconfig/sdraw/popupmenu/connector.xml
new file mode 100644
index 0000000..80f62bc
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/connector.xml
@@ -0,0 +1,64 @@
+<?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:NewRouting"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:ConnectorAttributes"/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </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:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Dismantle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/curve.xml b/sd/uiconfig/sdraw/popupmenu/curve.xml
new file mode 100644
index 0000000..46f01a2
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/curve.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:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
+  <menu:menuitem menu:id=".uno:CloseObject"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </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:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Dismantle"/>
+  <menu:menuitem menu:id=".uno:Break"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:NameGroup"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/draw.xml b/sd/uiconfig/sdraw/popupmenu/draw.xml
new file mode 100644
index 0000000..36c785f
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/draw.xml
@@ -0,0 +1,66 @@
+<?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: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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Dismantle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/drawtext.xml b/sd/uiconfig/sdraw/popupmenu/drawtext.xml
new file mode 100644
index 0000000..8929693
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/drawtext.xml
@@ -0,0 +1,45 @@
+<?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:HideLastLevel"/>
+  <menu:menuitem menu:id=".uno:ShowNextLevel"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:SetDefault"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertSymbol"/>
+  <menu:menuitem menu:id=".uno:OutlineBullet"/>
+  <menu:menu menu:id=".uno:TransliterateMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/form.xml b/sd/uiconfig/sdraw/popupmenu/form.xml
new file mode 100644
index 0000000..7307784
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/form.xml
@@ -0,0 +1,50 @@
+<?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: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:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </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:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Dismantle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:NameGroup"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/gluepoint.xml b/sd/uiconfig/sdraw/popupmenu/gluepoint.xml
new file mode 100644
index 0000000..c38a993
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/gluepoint.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:GlueInsertPoint"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:GlueEscapeDirectionLeft"/>
+  <menu:menuitem menu:id=".uno:GlueEscapeDirectionTop"/>
+  <menu:menuitem menu:id=".uno:GlueEscapeDirectionRight"/>
+  <menu:menuitem menu:id=".uno:GlueEscapeDirectionBottom"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:GluePercent"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:GlueHorzAlignLeft"/>
+  <menu:menuitem menu:id=".uno:GlueHorzAlignCenter"/>
+  <menu:menuitem menu:id=".uno:GlueHorzAlignRight"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:GlueVertAlignTop"/>
+  <menu:menuitem menu:id=".uno:GlueVertAlignCenter"/>
+  <menu:menuitem menu:id=".uno:GlueVertAlignBottom"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/graphic.xml b/sd/uiconfig/sdraw/popupmenu/graphic.xml
new file mode 100644
index 0000000..3d2a927
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/graphic.xml
@@ -0,0 +1,71 @@
+<?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:OriginalSize"/>
+  <menu:menuseparator/>
+  <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:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:Break"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/group.xml b/sd/uiconfig/sdraw/popupmenu/group.xml
new file mode 100644
index 0000000..d534990
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/group.xml
@@ -0,0 +1,64 @@
+<?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: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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatUngroup"/>
+  <menu:menuitem menu:id=".uno:EnterGroup"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/layertab.xml b/sd/uiconfig/sdraw/popupmenu/layertab.xml
new file mode 100644
index 0000000..d15a040
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/layertab.xml
@@ -0,0 +1,15 @@
+<?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:InsertLayer"/>
+  <menu:menuitem menu:id=".uno:ModifyLayer"/>
+  <menu:menuitem menu:id=".uno:DeleteLayer"/>
+  <menu:menuitem menu:id=".uno:RenameLayer"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/line.xml b/sd/uiconfig/sdraw/popupmenu/line.xml
new file mode 100644
index 0000000..f8aaccf
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/line.xml
@@ -0,0 +1,66 @@
+<?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:ToggleObjectBezierMode"/>
+  <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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Dismantle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/measure.xml b/sd/uiconfig/sdraw/popupmenu/measure.xml
new file mode 100644
index 0000000..5368dbd
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/measure.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:FormatLine"/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuitem menu:id=".uno:MeasureAttributes"/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </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:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Dismantle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:NameGroup"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/media.xml b/sd/uiconfig/sdraw/popupmenu/media.xml
new file mode 100644
index 0000000..118c847
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/media.xml
@@ -0,0 +1,43 @@
+<?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: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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menuitem menu:id=".uno:Break"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/multiselect.xml b/sd/uiconfig/sdraw/popupmenu/multiselect.xml
new file mode 100644
index 0000000..0bc83ad
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/multiselect.xml
@@ -0,0 +1,80 @@
+<?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:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </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:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatGroup"/>
+  <menu:menuitem menu:id=".uno:FormatUngroup"/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menu menu:id=".uno:PolyFormen">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:Combine"/>
+      <menu:menuitem menu:id=".uno:Dismantle"/>
+      <menu:menuitem menu:id=".uno:Connect"/>
+      <menu:menuitem menu:id=".uno:Break"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Merge"/>
+      <menu:menuitem menu:id=".uno:Substract"/>
+      <menu:menuitem menu:id=".uno:Intersect"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:EqualizeWidth"/>
+      <menu:menuitem menu:id=".uno:EqualizeHeight"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/oleobject.xml b/sd/uiconfig/sdraw/popupmenu/oleobject.xml
new file mode 100644
index 0000000..80e7869
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/oleobject.xml
@@ -0,0 +1,66 @@
+<?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:OriginalSize"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:Break"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/outlinetext.xml b/sd/uiconfig/sdraw/popupmenu/outlinetext.xml
new file mode 100644
index 0000000..1bbcb93
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/outlinetext.xml
@@ -0,0 +1,65 @@
+<?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:SetDefault"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuitem menu:id=".uno:TextAutoFitToSize"/>
+  <menu:menuitem menu:id=".uno:FontWork"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/page.xml b/sd/uiconfig/sdraw/popupmenu/page.xml
new file mode 100644
index 0000000..37a73ed
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/page.xml
@@ -0,0 +1,46 @@
+<?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:PageMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:InsertPage"/>
+      <menu:menuitem menu:id=".uno:DeletePage"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:PageSetup"/>
+      <menu:menuitem menu:id=".uno:SelectBackground"/>
+      <menu:menuitem menu:id=".uno:PresentationLayout"/>
+      <menu:menuitem menu:id=".uno:RenamePage"/>
+      <menu:menuitem menu:id=".uno:SaveBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ShowRuler"/>
+  <menu:menu menu:id=".uno:GridMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:GridVisible"/>
+      <menu:menuitem menu:id=".uno:GridUse"/>
+      <menu:menuitem menu:id=".uno:GridFront"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:SnapLinesMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:HelplinesVisible"/>
+      <menu:menuitem menu:id=".uno:HelplinesUse"/>
+      <menu:menuitem menu:id=".uno:HelplinesFront"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:CapturePoint"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/pagepane.xml b/sd/uiconfig/sdraw/popupmenu/pagepane.xml
new file mode 100644
index 0000000..cb40a16
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/pagepane.xml
@@ -0,0 +1,18 @@
+<?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:InsertPage"/>
+  <menu:menuitem menu:id=".uno:DeletePage"/>
+  <menu:menuitem menu:id=".uno:RenamePage"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/pagepanenosel.xml b/sd/uiconfig/sdraw/popupmenu/pagepanenosel.xml
new file mode 100644
index 0000000..805710a
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/pagepanenosel.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:InsertPage"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/pagetab.xml b/sd/uiconfig/sdraw/popupmenu/pagetab.xml
new file mode 100644
index 0000000..cb40a16
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/pagetab.xml
@@ -0,0 +1,18 @@
+<?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:InsertPage"/>
+  <menu:menuitem menu:id=".uno:DeletePage"/>
+  <menu:menuitem menu:id=".uno:RenamePage"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/table.xml b/sd/uiconfig/sdraw/popupmenu/table.xml
new file mode 100644
index 0000000..655bd1a
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/table.xml
@@ -0,0 +1,90 @@
+<?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:SetDefault"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TableDialog"/>
+  <menu:menu menu:id=".uno:CellMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MergeCells"/>
+      <menu:menuitem menu:id=".uno:SplitCell"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:CellVertTop"/>
+      <menu:menuitem menu:id=".uno:CellVertCenter"/>
+      <menu:menuitem menu:id=".uno:CellVertBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:RowMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:DistributeRows"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:EntireRow"/>
+      <menu:menuitem menu:id=".uno:InsertRowDialog"/>
+      <menu:menuitem menu:id=".uno:DeleteRows"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ColumnMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:DistributeColumns"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:EntireColumn"/>
+      <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
+      <menu:menuitem menu:id=".uno:DeleteColumns"/>
+    </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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/tabletext.xml b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
new file mode 100644
index 0000000..243e319
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
@@ -0,0 +1,72 @@
+<?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:SetDefault"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TableDialog"/>
+  <menu:menu menu:id=".uno:CellMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MergeCells"/>
+      <menu:menuitem menu:id=".uno:SplitCell"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:CellVertTop"/>
+      <menu:menuitem menu:id=".uno:CellVertCenter"/>
+      <menu:menuitem menu:id=".uno:CellVertBottom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:RowMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:DistributeRows"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:EntireRow"/>
+      <menu:menuitem menu:id=".uno:InsertRowDialog"/>
+      <menu:menuitem menu:id=".uno:DeleteRows"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ColumnMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:DistributeColumns"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:EntireColumn"/>
+      <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
+      <menu:menuitem menu:id=".uno:DeleteColumns"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertSymbol"/>
+  <menu:menuitem menu:id=".uno:OutlineBullet"/>
+  <menu:menu menu:id=".uno:TransliterateMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
+      <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/textbox.xml b/sd/uiconfig/sdraw/popupmenu/textbox.xml
new file mode 100644
index 0000000..dd67646
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/textbox.xml
@@ -0,0 +1,64 @@
+<?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:SetDefault"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuitem menu:id=".uno:FontWork"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/simpress/popupmenu/3dobject.xml b/sd/uiconfig/simpress/popupmenu/3dobject.xml
new file mode 100644
index 0000000..15135cb
--- /dev/null
+++ b/sd/uiconfig/simpress/popupmenu/3dobject.xml
@@ -0,0 +1,68 @@
+<?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: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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:MirrorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:MirrorVert"/>
+      <menu:menuitem menu:id=".uno:MirrorHorz"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Window3D"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AnimationEffects"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditStyle"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/simpress/popupmenu/3dscene.xml b/sd/uiconfig/simpress/popupmenu/3dscene.xml
new file mode 100644
index 0000000..60be78f
--- /dev/null
+++ b/sd/uiconfig/simpress/popupmenu/3dscene.xml
@@ -0,0 +1,61 @@
+<?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:Window3D"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EnterGroup"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AnimationEffects"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/simpress/popupmenu/3dscene2.xml b/sd/uiconfig/simpress/popupmenu/3dscene2.xml
new file mode 100644
index 0000000..f302e9c
--- /dev/null
+++ b/sd/uiconfig/simpress/popupmenu/3dscene2.xml
@@ -0,0 +1,61 @@
+<?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: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:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:Forward"/>
+      <menu:menuitem menu:id=".uno:Backward"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:BeforeObject"/>
+      <menu:menuitem menu:id=".uno:BehindObject"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ReverseOrder"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:DistributeSelection"/>
+  <menu:menu menu:id=".uno:ConvertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangeBezier"/>
+      <menu:menuitem menu:id=".uno:ChangePolygon"/>
+      <menu:menuitem menu:id=".uno:convert_to_contour"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+      <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+      <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EnterGroup"/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:Window3D"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:AnimationEffects"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/simpress/popupmenu/bezier.xml b/sd/uiconfig/simpress/popupmenu/bezier.xml
new file mode 100644
index 0000000..4136702
--- /dev/null
+++ b/sd/uiconfig/simpress/popupmenu/bezier.xml
@@ -0,0 +1,26 @@
+<?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:ToggleObjectBezierMode"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:BezierMove"/>
+  <menu:menuitem menu:id=".uno:BezierInsert"/>
+  <menu:menuitem menu:id=".uno:BezierDelete"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:BezierClose"/>
+  <menu:menuitem menu:id=".uno:BezierCutLine"/>
+  <menu:menuitem menu:id=".uno:BezierConvert"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:BezierEdge"/>
+  <menu:menuitem menu:id=".uno:BezierSmooth"/>
+  <menu:menuitem menu:id=".uno:BezierSymmetric"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:BezierEliminatePoints"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/simpress/popupmenu/connector.xml b/sd/uiconfig/simpress/popupmenu/connector.xml
new file mode 100644
index 0000000..074b343
--- /dev/null
+++ b/sd/uiconfig/simpress/popupmenu/connector.xml
@@ -0,0 +1,66 @@
+<?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:NewRouting"/>
+  <menu:menuseparator/>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list