summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu5
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu5
-rw-r--r--sd/UIConfig_sdraw.mk1
-rw-r--r--sd/UIConfig_simpress.mk1
-rw-r--r--sd/source/ui/view/drviews4.cxx2
-rw-r--r--sd/uiconfig/sdraw/popupmenu/tabletext.xml61
-rw-r--r--sd/uiconfig/simpress/popupmenu/tabletext.xml61
7 files changed, 1 insertions, 135 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 5b316f1a61be..a964507437a2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -140,11 +140,6 @@
<value xml:lang="en-US">Table</value>
</prop>
</node>
- <node oor:name="private:resource/popupmenu/tabletext" oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Table Text</value>
- </prop>
- </node>
<node oor:name="private:resource/popupmenu/textbox" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Box (drawing)</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index c3d21928fc1c..ac91bd27af7b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -145,11 +145,6 @@
<value xml:lang="en-US">Table</value>
</prop>
</node>
- <node oor:name="private:resource/popupmenu/tabletext" oor:op="replace">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Table Text</value>
- </prop>
- </node>
<node oor:name="private:resource/popupmenu/textbox" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Box (drawing)</value>
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 95b2fbc9162f..bbdb3efc4d87 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\
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 \
))
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index bc12bca51f4f..fce9c5704fda 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/simpress,\
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 \
))
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 3453cf3ae1f2..f487ce7b4c46 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -647,7 +647,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
{
if( (pObj->GetObjInventor() == SdrInventor::Default) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
{
- aPopupId = "tabletext";
+ aPopupId = "table";
}
else
{
diff --git a/sd/uiconfig/sdraw/popupmenu/tabletext.xml b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
deleted file mode 100644
index 7ecc89a5952d..000000000000
--- a/sd/uiconfig/sdraw/popupmenu/tabletext.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- <menu:menu menu:id=".uno:TableInsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertRowsBefore"/>
- <menu:menuitem menu:id=".uno:InsertRowsAfter"/>
- <menu:menuitem menu:id=".uno:InsertRowDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertColumnsBefore"/>
- <menu:menuitem menu:id=".uno:InsertColumnsAfter"/>
- <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableDeleteMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteRows"/>
- <menu:menuitem menu:id=".uno:DeleteColumns"/>
- <menu:menuitem menu:id=".uno:DeleteTable"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableAutoFitMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetRowHeight"/>
- <menu:menuitem menu:id=".uno:SetMinimalRowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:DistributeRows"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetMinimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:DistributeColumns"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:OutlineBullet"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDefault"/>
- <menu:menuitem menu:id=".uno:EditStyle"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableDialog"/>
-</menu:menupopup>
diff --git a/sd/uiconfig/simpress/popupmenu/tabletext.xml b/sd/uiconfig/simpress/popupmenu/tabletext.xml
deleted file mode 100644
index 7ecc89a5952d..000000000000
--- a/sd/uiconfig/simpress/popupmenu/tabletext.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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:MergeCells"/>
- <menu:menuitem menu:id=".uno:SplitCell"/>
- <menu:menu menu:id=".uno:TableInsertMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertRowsBefore"/>
- <menu:menuitem menu:id=".uno:InsertRowsAfter"/>
- <menu:menuitem menu:id=".uno:InsertRowDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertColumnsBefore"/>
- <menu:menuitem menu:id=".uno:InsertColumnsAfter"/>
- <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableDeleteMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:DeleteRows"/>
- <menu:menuitem menu:id=".uno:DeleteColumns"/>
- <menu:menuitem menu:id=".uno:DeleteTable"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menu menu:id=".uno:TableAutoFitMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:SetRowHeight"/>
- <menu:menuitem menu:id=".uno:SetMinimalRowHeight"/>
- <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
- <menu:menuitem menu:id=".uno:DistributeRows"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetMinimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
- <menu:menuitem menu:id=".uno:DistributeColumns"/>
- </menu:menupopup>
- </menu:menu>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:FontDialog"/>
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:OutlineBullet"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
- <menu:menuitem menu:id=".uno:EditHyperlink"/>
- <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SetDefault"/>
- <menu:menuitem menu:id=".uno:EditStyle"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TableDialog"/>
-</menu:menupopup>
generated by cgit (git 2.34.1) at 2024-07-11 14:28:55 +0000