diff options
| author | Roman Kuznetsov <antilibreoffice@gmail.com> | 2019-03-12 09:19:43 +0100 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@gmail.com> | 2019-03-13 12:07:35 +0100 |
| commit | e89eba0e1fa56c64e0d572b4f32ce5951378c1d7 (patch) | |
| tree | 66390b3419c7b1335a8d65241089cee2f20c1ad1 /sc | |
| parent | b1f15dd7e5a3b58a9595f9419c3208973d9244ff (diff) | |
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>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/UIConfig_scalc.mk | 1 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/toolbar/formcontrols.xml | 19 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/toolbar/moreformcontrols.xml | 32 |
3 files changed, 14 insertions, 38 deletions
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> |