summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-04-20 16:18:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2023-04-26 10:52:24 +0200
commit5dc84674816e5f3cad9a45b9307723de3dd25b71 (patch)
tree519a21245870ab39a0bc09bd9cab3fed322dabdd /sd
parent9c23f533d6749e94971f04e18f1537472cac6b86 (diff)
tdf#155006 don't show "InsertObjectFloatingFrame" by default in menus and toolbars
still exists, just isn't presented by default. help describes this as "Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file." and "Changes the properties of the selected floating frame. Floating frames work best when they contain an html document, and when they are inserted in another html document." This is basically support for html IFrames and is a fairly obscure thing for an ordinary document. Change-Id: Iec8ff591393e4ee4ed8791094e1f15a225808c8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150707 Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/uiconfig/sdraw/menubar/menubar.xml1
-rw-r--r--sd/uiconfig/sdraw/toolbar/insertbar.xml4
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar.ui32
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_compact.ui62
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui7
-rw-r--r--sd/uiconfig/simpress/menubar/menubar.xml1
-rw-r--r--sd/uiconfig/simpress/toolbar/insertbar.xml2
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar.ui7
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_compact.ui62
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui7
-rw-r--r--sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui7
11 files changed, 18 insertions, 174 deletions
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index c3792e54767d..4c97ad97e240 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -210,7 +210,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Text"/>
<menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame" menu:style="text"/>
<menu:menuitem menu:id=".uno:FontworkGalleryFloater"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:HyperlinkDialog"/>
diff --git a/sd/uiconfig/sdraw/toolbar/insertbar.xml b/sd/uiconfig/sdraw/toolbar/insertbar.xml
index e3773a3a79af..19df34a792d5 100644
--- a/sd/uiconfig/sdraw/toolbar/insertbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/insertbar.xml
@@ -20,8 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertPage"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
<toolbar:toolbarseparator/>
@@ -31,4 +29,4 @@
<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
-</toolbar:toolbar> \ No newline at end of file
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index acf4fb3be153..f5f582fc13b5 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1115,13 +1115,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -5219,29 +5212,6 @@
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="LineA18">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Insert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="sfxlo-NotebookbarToolBox" id="LineB10">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -5262,7 +5232,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index ebc647c18ceb..34d593d380ba 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -1144,13 +1144,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -4942,45 +4935,6 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="InsertObjectFloatingFrameSection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom129">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Insert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <style>
- <class name="priority-8"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">11</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Insert-Section-Field">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -5026,7 +4980,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -5110,7 +5064,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -5184,7 +5138,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -5258,7 +5212,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -5323,7 +5277,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -5371,7 +5325,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">17</property>
+ <property name="position">16</property>
</packing>
</child>
<child>
@@ -5422,7 +5376,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">18</property>
+ <property name="position">17</property>
</packing>
</child>
<child>
@@ -5461,7 +5415,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">19</property>
+ <property name="position">18</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index 489b787cbe5f..614e195d054b 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -1738,13 +1738,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 1c44f8d5044d..78489c56383e 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -242,7 +242,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Text"/>
<menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame" menu:style="text"/>
<menu:menuitem menu:id=".uno:FontworkGalleryFloater"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:HyperlinkDialog"/>
diff --git a/sd/uiconfig/simpress/toolbar/insertbar.xml b/sd/uiconfig/simpress/toolbar/insertbar.xml
index 0917cae4377d..1a6c358ec016 100644
--- a/sd/uiconfig/simpress/toolbar/insertbar.xml
+++ b/sd/uiconfig/simpress/toolbar/insertbar.xml
@@ -20,8 +20,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:InsertPage"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:visible="false"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
<toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 73a2f160f86e..4d99066f3ef6 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1213,13 +1213,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index 1e34d87a3189..b39a5118f526 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -1332,13 +1332,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -5228,45 +5221,6 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Insert-Section-ObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom129">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Insert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <style>
- <class name="priority-8"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">11</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Insert-Section-Field">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -5312,7 +5266,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">12</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -5396,7 +5350,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">13</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -5470,7 +5424,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">14</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -5544,7 +5498,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -5609,7 +5563,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">15</property>
</packing>
</child>
<child>
@@ -5657,7 +5611,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">17</property>
+ <property name="position">16</property>
</packing>
</child>
<child>
@@ -5708,7 +5662,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">20</property>
+ <property name="position">17</property>
</packing>
</child>
<child>
@@ -5747,7 +5701,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">21</property>
+ <property name="position">18</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 461f13833e9b..f3c6788752b3 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -1731,13 +1731,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index ba8dd6409a10..46074acdafee 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -1648,13 +1648,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="InsertObjectFloatingFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertObjectFloatingFrame</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="separator56">
<property name="visible">True</property>
<property name="can_focus">False</property>