diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/uiconfig/sglobal/menubar/menubar.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/sglobal/toolbar/insertbar.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/sglobal/toolbar/insertobjectbar.xml | 3 | ||||
-rw-r--r-- | sw/uiconfig/sweb/toolbar/insertbar.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/swform/toolbar/insertbar.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/swform/toolbar/insertobjectbar.xml | 3 | ||||
-rw-r--r-- | sw/uiconfig/swreport/menubar/menubar.xml | 7 | ||||
-rw-r--r-- | sw/uiconfig/swreport/toolbar/insertobjectbar.xml | 3 | ||||
-rw-r--r-- | sw/uiconfig/swriter/menubar/menubar.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/swriter/toolbar/insertbar.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 7 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 7 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 14 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 14 | ||||
-rw-r--r-- | sw/uiconfig/swxform/menubar/menubar.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/swxform/toolbar/insertbar.xml | 1 | ||||
-rw-r--r-- | sw/uiconfig/swxform/toolbar/insertobjectbar.xml | 3 |
17 files changed, 5 insertions, 64 deletions
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 @@ -1132,13 +1132,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="separator1"> <property name="visible">True</property> <property name="can_focus">False</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 @@ -1301,13 +1301,6 @@ </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> <property name="can_focus">False</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 @@ -1498,13 +1498,6 @@ </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> <property name="can_focus">False</property> @@ -1927,13 +1920,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-separator5"> <property name="visible">True</property> <property name="can_focus">False</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 @@ -1470,13 +1470,6 @@ </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> <property name="can_focus">False</property> @@ -1977,13 +1970,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-separator5"> <property name="visible">True</property> <property name="can_focus">False</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> |