From e89eba0e1fa56c64e0d572b4f32ce5951378c1d7 Mon Sep 17 00:00:00 2001
From: Roman Kuznetsov <antilibreoffice@gmail.com>
Date: Tue, 12 Mar 2019 09:19:43 +0100
Subject: tdf#112411 Merge "Form controls" and "More controls" into one toolbar

Change-Id: I7efb107f53a12185f1bd438983e6f446ee8b6a1b
Reviewed-on: https://gerrit.libreoffice.org/69079
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
---
 sd/UIConfig_sdraw.mk                              |  1 -
 sd/UIConfig_simpress.mk                           |  1 -
 sd/uiconfig/sdraw/toolbar/formcontrols.xml        | 15 ++++++++---
 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml    | 32 -----------------------
 sd/uiconfig/simpress/toolbar/formcontrols.xml     | 15 ++++++++---
 sd/uiconfig/simpress/toolbar/moreformcontrols.xml | 32 -----------------------
 6 files changed, 24 insertions(+), 72 deletions(-)
 delete mode 100644 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
 delete mode 100644 sd/uiconfig/simpress/toolbar/moreformcontrols.xml

(limited to 'sd')

diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 7ddddd22eb08..4f85f69c25ac 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
 	sd/uiconfig/sdraw/toolbar/linesbar \
 	sd/uiconfig/sdraw/toolbar/masterviewtoolbar \
 	sd/uiconfig/sdraw/toolbar/mediaobjectbar \
-	sd/uiconfig/sdraw/toolbar/moreformcontrols \
 	sd/uiconfig/sdraw/toolbar/notebookbarshortcuts \
 	sd/uiconfig/sdraw/toolbar/optimizetablebar \
 	sd/uiconfig/sdraw/toolbar/optionsbar \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 7c301e5e8a8d..f17c0ecd2b26 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
 	sd/uiconfig/simpress/toolbar/linesbar \
 	sd/uiconfig/simpress/toolbar/masterviewtoolbar \
 	sd/uiconfig/simpress/toolbar/mediaobjectbar \
-	sd/uiconfig/simpress/toolbar/moreformcontrols \
 	sd/uiconfig/simpress/toolbar/notebookbarshortcuts \
 	sd/uiconfig/simpress/toolbar/optimizetablebar \
 	sd/uiconfig/simpress/toolbar/optionsbar \
diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
index 4c9387324255..f0b133503d4d 100644
--- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
@@ -20,6 +20,8 @@
 <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:UseWizards"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
@@ -42,8 +44,15 @@
  <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
  <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
+ <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
+ <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
+ <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
+ <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
 </toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
deleted file mode 100644
index 36fa7f5bfc9f..000000000000
--- a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:TimeField"/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
-</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml
index 4c9387324255..f0b133503d4d 100644
--- a/sd/uiconfig/simpress/toolbar/formcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml
@@ -20,6 +20,8 @@
 <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:UseWizards"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
@@ -42,8 +44,15 @@
  <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
  <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
+ <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
+ <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
+ <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
+ <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
 </toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
deleted file mode 100644
index da114530b360..000000000000
--- a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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:TimeField"/>
- <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
-</toolbar:toolbar>
-- 
cgit