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>

sc/UIConfig_scalc.mk

@@ -72,7 +72,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
 	sc/uiconfig/scalc/toolbar/insertcellsbar \
 	sc/uiconfig/scalc/toolbar/linesbar \
 	sc/uiconfig/scalc/toolbar/mediaobjectbar \
-	sc/uiconfig/scalc/toolbar/moreformcontrols \
 	sc/uiconfig/scalc/toolbar/notebookbarshortcuts \
 	sc/uiconfig/scalc/toolbar/previewbar \
 	sc/uiconfig/scalc/toolbar/singlemode \

sc/uiconfig/scalc/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"/>
@@ -37,13 +39,20 @@
  <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
  <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/>
+ <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
+ <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
+ <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
+ <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
+ <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>

sc/uiconfig/scalc/toolbar/moreformcontrols.xml

-<?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:DateField"/>
- <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <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:toolbar>

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 \

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 \

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>

sd/uiconfig/sdraw/toolbar/moreformcontrols.xml

-<?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>

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>

sd/uiconfig/simpress/toolbar/moreformcontrols.xml

-<?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>

sw/UIConfig_sglobal.mk

@@ -61,7 +61,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sglobal,\
 	sw/uiconfig/sglobal/toolbar/insertbar \
 	sw/uiconfig/sglobal/toolbar/insertobjectbar \
 	sw/uiconfig/sglobal/toolbar/mediaobjectbar \
-	sw/uiconfig/sglobal/toolbar/moreformcontrols \
 	sw/uiconfig/sglobal/toolbar/numobjectbar \
 	sw/uiconfig/sglobal/toolbar/oleobjectbar \
 	sw/uiconfig/sglobal/toolbar/optimizetablebar \

sw/UIConfig_swform.mk

@@ -61,7 +61,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swform,\
 	sw/uiconfig/swform/toolbar/insertobjectbar \
 	sw/uiconfig/swform/toolbar/mailmerge \
 	sw/uiconfig/swform/toolbar/mediaobjectbar \
-	sw/uiconfig/swform/toolbar/moreformcontrols \
 	sw/uiconfig/swform/toolbar/numobjectbar \
 	sw/uiconfig/swform/toolbar/oleobjectbar \
 	sw/uiconfig/swform/toolbar/optimizetablebar \

sw/UIConfig_swreport.mk

@@ -61,7 +61,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swreport,\
 	sw/uiconfig/swreport/toolbar/insertobjectbar \
 	sw/uiconfig/swreport/toolbar/mailmerge \
 	sw/uiconfig/swreport/toolbar/mediaobjectbar \
-	sw/uiconfig/swreport/toolbar/moreformcontrols \
 	sw/uiconfig/swreport/toolbar/numobjectbar \
 	sw/uiconfig/swreport/toolbar/oleobjectbar \
 	sw/uiconfig/swreport/toolbar/optimizetablebar \

sw/UIConfig_swriter.mk

@@ -67,7 +67,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\
 	sw/uiconfig/swriter/toolbar/linesbar \
 	sw/uiconfig/swriter/toolbar/mailmerge \
 	sw/uiconfig/swriter/toolbar/mediaobjectbar \
-	sw/uiconfig/swriter/toolbar/moreformcontrols \
 	sw/uiconfig/swriter/toolbar/navigationobjectbar \
 	sw/uiconfig/swriter/toolbar/notebookbarshortcuts \
 	sw/uiconfig/swriter/toolbar/numobjectbar \

sw/UIConfig_swxform.mk

@@ -62,7 +62,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swxform,\
 	sw/uiconfig/swxform/toolbar/insertobjectbar \
 	sw/uiconfig/swxform/toolbar/mailmerge \
 	sw/uiconfig/swxform/toolbar/mediaobjectbar \
-	sw/uiconfig/swxform/toolbar/moreformcontrols \
 	sw/uiconfig/swxform/toolbar/numobjectbar \
 	sw/uiconfig/swxform/toolbar/oleobjectbar \
 	sw/uiconfig/swxform/toolbar/optimizetablebar \

sw/uiconfig/sglobal/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>

sw/uiconfig/sglobal/toolbar/moreformcontrols.xml

-<?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>

sw/uiconfig/sweb/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>

sw/uiconfig/swform/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>

sw/uiconfig/swform/toolbar/moreformcontrols.xml

-<?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>

sw/uiconfig/swreport/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>

sw/uiconfig/swreport/toolbar/moreformcontrols.xml

-<?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>

sw/uiconfig/swriter/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>

sw/uiconfig/swriter/toolbar/moreformcontrols.xml

-<?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>

sw/uiconfig/swxform/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>

sw/uiconfig/swxform/toolbar/moreformcontrols.xml

-<?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>