sc/uiconfig/scalc/menubar/menubar.xml | 1
sc/uiconfig/scalc/toolbar/insertbar.xml | 2
sc/uiconfig/scalc/ui/notebookbar.ui | 7 -
sc/uiconfig/scalc/ui/notebookbar_compact.ui | 7 -
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 7 -
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 7 -
sd/uiconfig/sdraw/menubar/menubar.xml | 1
sd/uiconfig/sdraw/toolbar/insertbar.xml | 4
sd/uiconfig/sdraw/ui/notebookbar.ui | 32 -------
sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 62 +-------------
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 7 -
sd/uiconfig/simpress/menubar/menubar.xml | 1
sd/uiconfig/simpress/toolbar/insertbar.xml | 2
sd/uiconfig/simpress/ui/notebookbar.ui | 7 -
sd/uiconfig/simpress/ui/notebookbar_compact.ui | 62 +-------------
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 7 -
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 7 -
sw/uiconfig/sglobal/menubar/menubar.xml | 1
sw/uiconfig/sglobal/toolbar/insertbar.xml | 1
sw/uiconfig/sglobal/toolbar/insertobjectbar.xml | 3
sw/uiconfig/sweb/toolbar/insertbar.xml | 1
sw/uiconfig/swform/toolbar/insertbar.xml | 1
sw/uiconfig/swform/toolbar/insertobjectbar.xml | 3
sw/uiconfig/swreport/menubar/menubar.xml | 7 -
sw/uiconfig/swreport/toolbar/insertobjectbar.xml | 3
sw/uiconfig/swriter/menubar/menubar.xml | 1
sw/uiconfig/swriter/toolbar/insertbar.xml | 1
sw/uiconfig/swriter/ui/notebookbar.ui | 7 -
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 7 -
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 14 ---
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 14 ---
sw/uiconfig/swxform/menubar/menubar.xml | 1
sw/uiconfig/swxform/toolbar/insertbar.xml | 1
sw/uiconfig/swxform/toolbar/insertobjectbar.xml | 3
34 files changed, 23 insertions(+), 269 deletions(-)
New commits:
commit 5dc84674816e5f3cad9a45b9307723de3dd25b71
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Apr 20 16:18:00 2023 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Apr 26 10:52:24 2023 +0200
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.tie...@documentfoundation.org>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index c16dbf11e73b..7b51b4b8d816 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -256,7 +256,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:DrawText"/>
<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/sc/uiconfig/scalc/toolbar/insertbar.xml
b/sc/uiconfig/scalc/toolbar/insertbar.xml
index 9941a8e142e0..ef8efb595e5e 100644
--- a/sc/uiconfig/scalc/toolbar/insertbar.xml
+++ b/sc/uiconfig/scalc/toolbar/insertbar.xml
@@ -18,8 +18,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertSymbol"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index e2e858c9d447..7669f4196949 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1236,13 +1236,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index 327b2bd9f499..b95915468420 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -1463,13 +1463,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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="separator87">
<property name="visible">True</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index d446703b1948..4b8a5dfe8309 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -1477,13 +1477,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 4d7f120090f0..fe46648df3b1 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -1969,13 +1969,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
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
@@ -1114,13 +1114,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
@@ -5218,29 +5211,6 @@
<property name="can_focus">False</property>
<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>
@@ -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
@@ -1143,13 +1143,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
@@ -4941,45 +4934,6 @@
<property name="position">10</property>
</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>
@@ -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
@@ -1737,13 +1737,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
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
@@ -1212,13 +1212,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
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
@@ -1331,13 +1331,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
@@ -5227,45 +5220,6 @@
<property name="position">10</property>
</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>
@@ -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
@@ -1730,13 +1730,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
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
@@ -1647,13 +1647,6 @@
<property name="action_name">.uno:FontworkGalleryFloater</property>
</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>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 44d9f253369c..4388a057e6b5 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -298,7 +298,6 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertFrameInteract"/>
<menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:FontworkGalleryFloater" menu:style="text"/>
diff --git a/sw/uiconfig/sglobal/toolbar/insertbar.xml
b/sw/uiconfig/sglobal/toolbar/insertbar.xml
index 6f1434f1ff0e..319ff634dcad 100644
--- a/sw/uiconfig/sglobal/toolbar/insertbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/insertbar.xml
@@ -21,7 +21,6 @@
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSection"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
<toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
diff --git a/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
b/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
index 966fe03ee96f..4f5b5894c1d5 100644
--- a/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
@@ -18,6 +18,5 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/insertbar.xml
b/sw/uiconfig/sweb/toolbar/insertbar.xml
index 6f1434f1ff0e..319ff634dcad 100644
--- a/sw/uiconfig/sweb/toolbar/insertbar.xml
+++ b/sw/uiconfig/sweb/toolbar/insertbar.xml
@@ -21,7 +21,6 @@
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSection"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
<toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
diff --git a/sw/uiconfig/swform/toolbar/insertbar.xml
b/sw/uiconfig/swform/toolbar/insertbar.xml
index 6f1434f1ff0e..319ff634dcad 100644
--- a/sw/uiconfig/swform/toolbar/insertbar.xml
+++ b/sw/uiconfig/swform/toolbar/insertbar.xml
@@ -21,7 +21,6 @@
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSection"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
<toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
diff --git a/sw/uiconfig/swform/toolbar/insertobjectbar.xml
b/sw/uiconfig/swform/toolbar/insertobjectbar.xml
index 966fe03ee96f..4f5b5894c1d5 100644
--- a/sw/uiconfig/swform/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/insertobjectbar.xml
@@ -18,6 +18,5 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml
b/sw/uiconfig/swreport/menubar/menubar.xml
index 92f17fadd3f4..59f630afc70e 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -240,12 +240,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:DrawText"/>
<menu:menuitem menu:id=".uno:InsertAnnotation"/>
- <menu:menu menu:id=".uno:InsertFrameMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:InsertFrame"/>
<menu:menuitem menu:id=".uno:FontworkGalleryFloater" menu:style="text"/>
<menu:menuitem menu:id=".uno:InsertCaptionDialog" menu:style="text"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
b/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
index 966fe03ee96f..4f5b5894c1d5 100644
--- a/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
@@ -18,6 +18,5 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index 0fa3b2e83c53..51d20b841740 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -308,7 +308,6 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertFrameInteract"/>
<menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:FontworkGalleryFloater"/>
diff --git a/sw/uiconfig/swriter/toolbar/insertbar.xml
b/sw/uiconfig/swriter/toolbar/insertbar.xml
index 6f1434f1ff0e..319ff634dcad 100644
--- a/sw/uiconfig/swriter/toolbar/insertbar.xml
+++ b/sw/uiconfig/swriter/toolbar/insertbar.xml
@@ -21,7 +21,6 @@
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSection"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
<toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index a2344e9029fb..b6b66f4cbd81 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1131,13 +1131,6 @@
<property name="action_name">.uno:InsertFrameInteract</property>
</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="separator1">
<property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 8226b60d7861..83cfc701c994 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -1300,13 +1300,6 @@
<property name="action_name">.uno:InsertFrameInteract</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="InsertObjectFloatingFrameD">
- <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="separator91">
<property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 21c396bfd26b..bc447979bd4e 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -1497,13 +1497,6 @@
<property name="action_name">.uno:InsertFrame</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuFrame-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="MenuFrame-separator1">
<property name="visible">True</property>
@@ -1926,13 +1919,6 @@
<property name="action_name">.uno:InsertFrameInteract</property>
</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-separator5">
<property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 2ebe0b5817b0..8b95bc51efb9 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -1469,13 +1469,6 @@
<property name="action_name">.uno:InsertFrame</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuFrame-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="MenuFrame-separator1">
<property name="visible">True</property>
@@ -1976,13 +1969,6 @@
<property name="action_name">.uno:InsertFrameInteract</property>
</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-separator5">
<property name="visible">True</property>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml
b/sw/uiconfig/swxform/menubar/menubar.xml
index a4af6780f03d..70e0c4a10b84 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -297,7 +297,6 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertFrameInteract"/>
<menu:menuitem menu:id=".uno:InsertFrame"/>
- <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:FontworkGalleryFloater" menu:style="text"/>
diff --git a/sw/uiconfig/swxform/toolbar/insertbar.xml
b/sw/uiconfig/swxform/toolbar/insertbar.xml
index 6f1434f1ff0e..319ff634dcad 100644
--- a/sw/uiconfig/swxform/toolbar/insertbar.xml
+++ b/sw/uiconfig/swxform/toolbar/insertbar.xml
@@ -21,7 +21,6 @@
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
<toolbar:toolbaritem xlink:href=".uno:InsertSection"/>
<toolbar:toolbaritem xlink:href=".uno:InsertFrameInteract"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
<toolbar:toolbaritem xlink:href=".uno:InsertEndnote"/>
diff --git a/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
b/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
index 966fe03ee96f..4f5b5894c1d5 100644
--- a/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
@@ -18,6 +18,5 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame"/>
<toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
