sc/uiconfig/scalc/popupmenu/audit.xml | 1
sc/uiconfig/scalc/popupmenu/draw.xml | 8 +++-
sc/uiconfig/scalc/popupmenu/form.xml | 2 -
sc/uiconfig/scalc/popupmenu/graphic.xml | 1
sc/uiconfig/scalc/popupmenu/media.xml | 7 +++-
sc/uiconfig/scalc/popupmenu/oleobject.xml | 10 ------
sc/uiconfig/scalc/toolbar/drawobjectbar.xml | 2 -
sc/uiconfig/scalc/toolbar/formdesign.xml | 41 +++++++++++++++++--------
sc/uiconfig/scalc/toolbar/formsfilterbar.xml | 5 +--
sc/uiconfig/scalc/toolbar/graphicobjectbar.xml | 6 +--
sw/uiconfig/swriter/toolbar/fullscreenbar.xml | 19 ++++++++++-
11 files changed, 66 insertions(+), 36 deletions(-)
New commits:
commit cc94ca3dd1350c5cd23dcf2ebe69ef0838439d1f
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Sun Oct 28 23:03:10 2018 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Mon Oct 29 19:43:01 2018 +0100
calc: sync calc popupmenu and toolbare files with writer
Change-Id: I0cd058974f879166d2205dd7f26e0fd867db4c47
Reviewed-on: https://gerrit.libreoffice.org/62487
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sc/uiconfig/scalc/popupmenu/audit.xml
b/sc/uiconfig/scalc/popupmenu/audit.xml
index 216d626c8795..5748bdb748a5 100644
--- a/sc/uiconfig/scalc/popupmenu/audit.xml
+++ b/sc/uiconfig/scalc/popupmenu/audit.xml
@@ -16,6 +16,7 @@
<menu:menuitem menu:id=".uno:FillModeRemovePredescessor"/>
<menu:menuitem menu:id=".uno:FillModeTraceSuccessor"/>
<menu:menuitem menu:id=".uno:FillModeRemoveSuccessor"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ClearArrows"/>
<menu:menuitem menu:id=".uno:FillModeEnd"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/draw.xml
b/sc/uiconfig/scalc/popupmenu/draw.xml
index 690dfbffc02e..0df2b8ed8a60 100644
--- a/sc/uiconfig/scalc/popupmenu/draw.xml
+++ b/sc/uiconfig/scalc/popupmenu/draw.xml
@@ -14,8 +14,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
<menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
- <menu:menuitem menu:id=".uno:ObjectMirrorVertical"/>
- <menu:menuitem menu:id=".uno:ObjectMirrorHorizontal"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FitCellSize"/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
@@ -45,6 +43,12 @@
<menu:menuitem menu:id=".uno:SetObjectToBackground"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:FlipMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ObjectMirrorVertical"/>
+ <menu:menuitem menu:id=".uno:ObjectMirrorHorizontal"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuitem menu:id=".uno:FormatGroup"/>
<menu:menuitem menu:id=".uno:FormatUngroup"/>
<menu:menuitem menu:id=".uno:EnterGroup"/>
diff --git a/sc/uiconfig/scalc/popupmenu/form.xml
b/sc/uiconfig/scalc/popupmenu/form.xml
index d1875118b331..7c0dc23842c2 100644
--- a/sc/uiconfig/scalc/popupmenu/form.xml
+++ b/sc/uiconfig/scalc/popupmenu/form.xml
@@ -12,8 +12,8 @@
<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:FitCellSize"/>
+ <menu:menuitem menu:id=".uno:TransformDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ControlProperties"/>
<menu:menuitem menu:id=".uno:FormProperties"/>
diff --git a/sc/uiconfig/scalc/popupmenu/graphic.xml
b/sc/uiconfig/scalc/popupmenu/graphic.xml
index b769a614848a..0efe30f531fc 100644
--- a/sc/uiconfig/scalc/popupmenu/graphic.xml
+++ b/sc/uiconfig/scalc/popupmenu/graphic.xml
@@ -21,7 +21,6 @@
<menu:menuitem menu:id=".uno:OriginalSize"/>
<menu:menuitem menu:id=".uno:FitCellSize"/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:AnchorMenu"/>
<menu:menu menu:id=".uno:ObjectAlign">
diff --git a/sc/uiconfig/scalc/popupmenu/media.xml
b/sc/uiconfig/scalc/popupmenu/media.xml
index a919bb3ab6bd..a05d6942b27d 100644
--- a/sc/uiconfig/scalc/popupmenu/media.xml
+++ b/sc/uiconfig/scalc/popupmenu/media.xml
@@ -12,8 +12,8 @@
<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:FitCellSize"/>
+ <menu:menuitem menu:id=".uno:TransformDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:AnchorMenu"/>
<menu:menu menu:id=".uno:ObjectAlign">
@@ -42,6 +42,9 @@
<menu:menuitem menu:id=".uno:RenameObject"/>
<menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+ <menu:menuitem menu:id=".uno:EditShapeHyperlink"/>
+ <menu:menuitem menu:id=".uno:DeleteShapeHyperlink"/>
+ <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+ <menu:menuitem menu:id=".uno:AssignMacro"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/oleobject.xml
b/sc/uiconfig/scalc/popupmenu/oleobject.xml
index 143320b4f3f9..39779cd19733 100644
--- a/sc/uiconfig/scalc/popupmenu/oleobject.xml
+++ b/sc/uiconfig/scalc/popupmenu/oleobject.xml
@@ -14,8 +14,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:OriginalSize"/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
- <menu:menuitem menu:id=".uno:FormatLine"/>
- <menu:menuitem menu:id=".uno:FormatArea"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:AnchorMenu"/>
<menu:menu menu:id=".uno:ObjectAlign">
@@ -40,14 +38,6 @@
<menu:menuitem menu:id=".uno:SetObjectToBackground"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:RotateFlipMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:ObjectMirrorVertical"/>
- <menu:menuitem menu:id=".uno:ObjectMirrorHorizontal"/>
- </menu:menupopup>
- </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
<menu:menuitem menu:id=".uno:RenameObject"/>
diff --git a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
index 976ca019a23c..b9f07a437f0c 100644
--- a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
@@ -38,13 +38,13 @@
<toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
<toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
<toolbar:toolbaritem xlink:href=".uno:XLineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
<toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FillStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineEndStyle"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/>
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
diff --git a/sc/uiconfig/scalc/toolbar/formdesign.xml
b/sc/uiconfig/scalc/toolbar/formdesign.xml
index 551153b6a353..1d4a5c96c6d9 100644
--- a/sc/uiconfig/scalc/toolbar/formdesign.xml
+++ b/sc/uiconfig/scalc/toolbar/formdesign.xml
@@ -18,31 +18,46 @@
* 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:SelectObject"/>
- <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
- <toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:AddField"/>
- <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"
toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"
toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BringToFront"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectForwardOne"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatGroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:FormatUngroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:EnterGroup" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:LeaveGroup" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
+ <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowFmExplorer"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddField"/>
+ <toolbar:toolbaritem xlink:href=".uno:TabDialog"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:OpenReadOnly"/>
+ <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible"/>
<toolbar:toolbaritem xlink:href=".uno:GridUse"/>
<toolbar:toolbaritem xlink:href=".uno:HelplinesMove"/>
diff --git a/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
b/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
index c5e89318ff82..096d7e73d821 100644
--- a/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formsfilterbar.xml
@@ -18,7 +18,8 @@
* 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:FormFilterNavigator"/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterExecute"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFilterNavigator"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormFilterExit"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
index 47f9a46c0bc5..f9f5e97a6e71 100644
--- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml
@@ -35,15 +35,15 @@
<toolbar:toolbaritem xlink:href=".uno:ObjectBackOne"/>
<toolbar:toolbaritem xlink:href=".uno:SendToBack"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"
toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"
toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToForeground"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetObjectToBackground"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:XLineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
<toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:FillStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillColor" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:FillShadow"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox"/>
diff --git a/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
b/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
index 4162e396e5f2..9b007728dcdc 100644
--- a/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/swriter/toolbar/fullscreenbar.xml
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument
1.0//EN" "toolbar.dtd">
+<!--
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * 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:FullScreen"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
