7f5379e040
Revert the two changes made under this issue tdf#33749: 1) Cell context menu back to 7.2 2) Format - Merge Cells menu back to 7.2 3) Help pages to reflect this Moving forward with the following changes: 1) Rename "Split Cells" to "Unmerge Cells" (Calc only) which more accurately describes it's function in Calc (and for consistency with alternative office software). 2) Add "Merge Cells" and "Unmerge Cells" to Formatting toolbar alongside "Merge and Center Cells", including other available user interface schemes where possible. 3) Change the Format - Merge Cells menu icon to the "Merge Cells" icon as less confusing than the current "Merge and Center Cells" icon. Re-label the Format - Merge Cells menu to Format - Merge and Unmerge Cells. 4) Add TooltipLabel to .uno:ToggleMergeCells to clarify dual action. 5) Add Split Cells to Table context menu in Impress (as it is in Writer). 6) Help pages to reflect changes. 7) Remove two duplicate entries in the sUnoCommands array in init.cxx (one was ".uno:MergeCells" related to this change). This is untested but relates to status updates sent to the headless LOK clients. I assume duplicate entries would generate duplicate updates, which may be harmless but is probably not desirable. Change-Id: I3063f871707a7286d95108d3a34a5287401baa6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122811 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
83 lines
4.4 KiB
XML
83 lines
4.4 KiB
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:DesignerDialog" toolbar:visible="false"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:visible="false"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:visible="false"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:visible="false"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:Bold"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:Italic"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:Underline"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:UnderlineDouble" toolbar:visible="false"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:Strikeout" toolbar:visible="false"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:Overline" toolbar:visible="false"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:OutlineFont" toolbar:visible="false"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:Color"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:visible="false"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:AlignVCenter"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:WrapText"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:visible="false"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:NumberFormatDecimal"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:NumberFormatDate"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:NumberFormatScientific" toolbar:visible="false"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:NumberFormatIncDecimals"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:NumberFormatDecDecimals"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:IncrementIndent"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:DecrementIndent"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:ConditionalFormatMenu"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:ToggleSheetGrid" toolbar:visible="false"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:ParaRightToLeft"/>
|
|
<toolbar:toolbarseparator/>
|
|
<toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight"/>
|
|
<toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom"/>
|
|
</toolbar:toolbar>
|