From 67eaa07e02a08bee869acd6d6a9dfb91adcf8fd1 Mon Sep 17 00:00:00 2001
From: andreas kainz <kainz.a@gmail.com>
Date: Thu, 21 Feb 2019 18:57:00 +0100
Subject: sync sglobal UI files with swriter UI files

Change-Id: Icd326ab025ffb74f36dba880261ed3638bcdfd5c
Reviewed-on: https://gerrit.libreoffice.org/68191
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
---
 sw/uiconfig/sglobal/popupmenu/text.xml            |  1 +
 sw/uiconfig/sglobal/statusbar/statusbar.xml       | 19 ++++++++++---------
 sw/uiconfig/sglobal/toolbar/changes.xml           |  2 ++
 sw/uiconfig/sglobal/toolbar/fullscreenbar.xml     | 19 ++++++++++++++++++-
 sw/uiconfig/sglobal/toolbar/tableobjectbar.xml    |  2 +-
 sw/uiconfig/swriter/toolbar/lc_absoluterecord.svg |  6 ------
 6 files changed, 32 insertions(+), 17 deletions(-)
 delete mode 100644 sw/uiconfig/swriter/toolbar/lc_absoluterecord.svg

(limited to 'sw/uiconfig')

diff --git a/sw/uiconfig/sglobal/popupmenu/text.xml b/sw/uiconfig/sglobal/popupmenu/text.xml
index 999fd1259507..332a2caa26f0 100644
--- a/sw/uiconfig/sglobal/popupmenu/text.xml
+++ b/sw/uiconfig/sglobal/popupmenu/text.xml
@@ -75,6 +75,7 @@
     </menu:menupopup>
   </menu:menu>
   <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertAnnotation"/>
   <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
   <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
   <menu:menuitem menu:id=".uno:NextTrackedChange"/>
diff --git a/sw/uiconfig/sglobal/statusbar/statusbar.xml b/sw/uiconfig/sglobal/statusbar/statusbar.xml
index ff1f57d9d734..f85f07daa068 100644
--- a/sw/uiconfig/sglobal/statusbar/statusbar.xml
+++ b/sw/uiconfig/sglobal/statusbar/statusbar.xml
@@ -18,15 +18,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54"/>
+ <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:mandatory="true" statusbar:width="54"/>
+ <statusbar:statusbaritem xlink:href=".uno:StateWordCount" statusbar:align="left" statusbar:autosize="true"/>
  <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100"/>
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="55"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="10"/>
+ <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:mandatory="false" statusbar:width="100"/>
+ <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:mandatory="false" statusbar:width="55"/>
+ <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="false" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:mandatory="false" statusbar:ownerdraw="true" statusbar:width="10"/>
  <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35"/>
+ <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:mandatory="true" statusbar:width="130"/>
+ <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:mandatory="true" statusbar:width="35"/>
 </statusbar:statusbar>
diff --git a/sw/uiconfig/sglobal/toolbar/changes.xml b/sw/uiconfig/sglobal/toolbar/changes.xml
index af6d4dcf724a..9865acd2eb4b 100644
--- a/sw/uiconfig/sglobal/toolbar/changes.xml
+++ b/sw/uiconfig/sglobal/toolbar/changes.xml
@@ -25,6 +25,8 @@
  <toolbar:toolbaritem xlink:href=".uno:NextTrackedChange"/>
  <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChange"/>
  <toolbar:toolbaritem xlink:href=".uno:RejectTrackedChange"/>
+ <toolbar:toolbaritem xlink:href=".uno:AcceptAllTrackedChanges"/>
+ <toolbar:toolbaritem xlink:href=".uno:RejectAllTrackedChanges"/>
  <toolbar:toolbaritem xlink:href=".uno:AcceptTrackedChanges"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/>
diff --git a/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml b/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml
index 4162e396e5f2..9b007728dcdc 100644
--- a/sw/uiconfig/sglobal/toolbar/fullscreenbar.xml
+++ b/sw/uiconfig/sglobal/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>
diff --git a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
index 75efbade4479..55297a1140df 100644
--- a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
@@ -42,7 +42,7 @@
  <toolbar:toolbaritem xlink:href=".uno:CellVertCenter"/>
  <toolbar:toolbaritem xlink:href=".uno:CellVertBottom"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableCellBackgroundColor"/>
  <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
diff --git a/sw/uiconfig/swriter/toolbar/lc_absoluterecord.svg b/sw/uiconfig/swriter/toolbar/lc_absoluterecord.svg
deleted file mode 100644
index abbe486ba1bc..000000000000
--- a/sw/uiconfig/swriter/toolbar/lc_absoluterecord.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
-     style="fill:#555753"
-     d="M 15 5.9921875 C 14.44771 6.0008075 14.006983 6.4555229 14.015625 7.0078125 L 14.015625 9.0078125 L 13.015625 9.0078125 C 11.663302 8.9886875 11.663302 11.026938 13.015625 11.007812 L 14.015625 11.007812 L 14.015625 13.007812 L 13.015625 13.007812 C 11.663302 12.988694 11.663302 15.026938 13.015625 15.007812 L 14.015625 15.007812 L 14.015625 17.007812 C 14.01568 17.560074 14.463363 18.007758 15.015625 18.007812 C 15.637008 18.015812 16.11513 17.461072 16.015625 16.847656 L 16.015625 15.007812 L 18.015625 15.007812 L 18.015625 17.007812 C 18.01568 17.560074 18.463363 18.007758 19.015625 18.007812 C 19.637008 18.015812 20.11513 17.461072 20.015625 16.847656 L 20.015625 15.007812 L 21.015625 15.007812 C 22.367948 15.026943 22.367948 12.988689 21.015625 13.007812 L 20.015625 13.007812 L 20.015625 11.007812 L 21.015625 11.007812 C 22.367948 11.026943 22.367948 8.9886873 21.015625 9.0078125 L 20.015625 9.0078125 L 20.015625 7.0078125 C 20.024425 6.4432798 19.564533 5.9833538 19 5.9921875 C 18.44771 6.0008075 18.006983 6.4555229 18.015625 7.0078125 L 18.015625 9.0078125 L 16.015625 9.0078125 L 16.015625 7.0078125 C 16.024425 6.4432798 15.564533 5.9833538 15 5.9921875 z M 2.9648438 6.0078125 C 2.4148714 6.0110925 1.9707483 6.4578304 1.9707031 7.0078125 L 1.9707031 16.990234 C 1.9694631 17.839011 2.9594753 18.303376 3.6113281 17.759766 L 9.6113281 12.759766 C 10.093107 12.359855 10.093107 11.620614 9.6113281 11.220703 L 3.6113281 6.2382812 C 3.4297657 6.087605 3.2007779 6.0059718 2.9648438 6.0078125 z M 16.015625 11.007812 L 18.015625 11.007812 L 18.015625 13.007812 L 16.015625 13.007812 L 16.015625 11.007812 z "
-     />
- </svg>
-- 
cgit