sc/UIConfig_scalc.mk                              |    1 
 sc/uiconfig/scalc/toolbar/formcontrols.xml        |   19 +++++++++----
 sc/uiconfig/scalc/toolbar/moreformcontrols.xml    |   32 ----------------------
 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 ----------------------
 sw/UIConfig_sglobal.mk                            |    1 
 sw/UIConfig_swform.mk                             |    1 
 sw/UIConfig_swreport.mk                           |    1 
 sw/UIConfig_swriter.mk                            |    1 
 sw/UIConfig_swxform.mk                            |    1 
 sw/uiconfig/sglobal/toolbar/formcontrols.xml      |   15 ++++++++--
 sw/uiconfig/sglobal/toolbar/moreformcontrols.xml  |   32 ----------------------
 sw/uiconfig/sweb/toolbar/formcontrols.xml         |   15 ++++++++--
 sw/uiconfig/swform/toolbar/formcontrols.xml       |   15 ++++++++--
 sw/uiconfig/swform/toolbar/moreformcontrols.xml   |   32 ----------------------
 sw/uiconfig/swreport/toolbar/formcontrols.xml     |   15 ++++++++--
 sw/uiconfig/swreport/toolbar/moreformcontrols.xml |   32 ----------------------
 sw/uiconfig/swriter/toolbar/formcontrols.xml      |   15 ++++++++--
 sw/uiconfig/swriter/toolbar/moreformcontrols.xml  |   32 ----------------------
 sw/uiconfig/swxform/toolbar/formcontrols.xml      |   15 ++++++++--
 sw/uiconfig/swxform/toolbar/moreformcontrols.xml  |   32 ----------------------
 25 files changed, 110 insertions(+), 293 deletions(-)

New commits:
commit e89eba0e1fa56c64e0d572b4f32ce5951378c1d7
Author:     Roman Kuznetsov <antilibreoff...@gmail.com>
AuthorDate: Tue Mar 12 09:19:43 2019 +0100
Commit:     Heiko Tietze <tietze.he...@gmail.com>
CommitDate: Wed Mar 13 12:07:35 2019 +0100

    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.he...@gmail.com>
    Tested-by: Heiko Tietze <tietze.he...@gmail.com>

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 9523c42f574d..68f210509c2a 100644
--- a/sc/UIConfig_scalc.mk
+++ b/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 \
diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml 
b/sc/uiconfig/scalc/toolbar/formcontrols.xml
index 4fb5eecc6950..f0b133503d4d 100644
--- a/sc/uiconfig/scalc/toolbar/formcontrols.xml
+++ b/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>
diff --git a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml 
b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
deleted file mode 100644
index 8c0f42d623a2..000000000000
--- a/sc/uiconfig/scalc/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: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>
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>
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk
index 4ea7ae841b6c..fd806255f4cf 100644
--- a/sw/UIConfig_sglobal.mk
+++ b/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 \
diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk
index 4ca2f95fc2f7..d81ea27fa9ea 100644
--- a/sw/UIConfig_swform.mk
+++ b/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 \
diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk
index fe9789e3ea51..296f71bfca9a 100644
--- a/sw/UIConfig_swreport.mk
+++ b/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 \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index f18fde50ab17..b285bc0dc4ad 100644
--- a/sw/UIConfig_swriter.mk
+++ b/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 \
diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk
index 59bc4f25fc29..7a9dd614c074 100644
--- a/sw/UIConfig_swxform.mk
+++ b/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 \
diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml 
b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
index 4c9387324255..f0b133503d4d 100644
--- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml
+++ b/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>
diff --git a/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml 
b/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml
deleted file mode 100644
index 36fa7f5bfc9f..000000000000
--- a/sw/uiconfig/sglobal/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/sw/uiconfig/sweb/toolbar/formcontrols.xml 
b/sw/uiconfig/sweb/toolbar/formcontrols.xml
index 4c9387324255..f0b133503d4d 100644
--- a/sw/uiconfig/sweb/toolbar/formcontrols.xml
+++ b/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>
diff --git a/sw/uiconfig/swform/toolbar/formcontrols.xml 
b/sw/uiconfig/swform/toolbar/formcontrols.xml
index 4c9387324255..f0b133503d4d 100644
--- a/sw/uiconfig/swform/toolbar/formcontrols.xml
+++ b/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>
diff --git a/sw/uiconfig/swform/toolbar/moreformcontrols.xml 
b/sw/uiconfig/swform/toolbar/moreformcontrols.xml
deleted file mode 100644
index 36fa7f5bfc9f..000000000000
--- a/sw/uiconfig/swform/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/sw/uiconfig/swreport/toolbar/formcontrols.xml 
b/sw/uiconfig/swreport/toolbar/formcontrols.xml
index 4c9387324255..f0b133503d4d 100644
--- a/sw/uiconfig/swreport/toolbar/formcontrols.xml
+++ b/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>
diff --git a/sw/uiconfig/swreport/toolbar/moreformcontrols.xml 
b/sw/uiconfig/swreport/toolbar/moreformcontrols.xml
deleted file mode 100644
index 36fa7f5bfc9f..000000000000
--- a/sw/uiconfig/swreport/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/sw/uiconfig/swriter/toolbar/formcontrols.xml 
b/sw/uiconfig/swriter/toolbar/formcontrols.xml
index 4c9387324255..f0b133503d4d 100644
--- a/sw/uiconfig/swriter/toolbar/formcontrols.xml
+++ b/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>
diff --git a/sw/uiconfig/swriter/toolbar/moreformcontrols.xml 
b/sw/uiconfig/swriter/toolbar/moreformcontrols.xml
deleted file mode 100644
index 36fa7f5bfc9f..000000000000
--- a/sw/uiconfig/swriter/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/sw/uiconfig/swxform/toolbar/formcontrols.xml 
b/sw/uiconfig/swxform/toolbar/formcontrols.xml
index 4c9387324255..f0b133503d4d 100644
--- a/sw/uiconfig/swxform/toolbar/formcontrols.xml
+++ b/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>
diff --git a/sw/uiconfig/swxform/toolbar/moreformcontrols.xml 
b/sw/uiconfig/swxform/toolbar/moreformcontrols.xml
deleted file mode 100644
index 36fa7f5bfc9f..000000000000
--- a/sw/uiconfig/swxform/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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to