summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2017-09-25 03:46:24 +0400
committerYousuf Philips <philipz85@hotmail.com>2017-09-25 14:36:48 +0200
commit1de71f95047630c1488e0a63a3a43cea8dfb8507 (patch)
tree4773dd5c533ecbf27f47967989a89713d3be546c
parentcc12f1c87fbf482b1e35f07f009791e351ca223d (diff)
tdf#106781 Copy style-focused toolbar to writer master doc
Change-Id: Icb07748be6f0603e2229809be19f3fe44d0edebb Reviewed-on: https://gerrit.libreoffice.org/42730 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com>
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu23
-rw-r--r--sw/UIConfig_sglobal.mk1
-rw-r--r--sw/uiconfig/sglobal/toolbar/textstylebar.xml92
3 files changed, 116 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index dbf4d6a13947..30bbcf2b0913 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -791,6 +791,29 @@
<value>false</value>
</prop>
</node>
+ <node oor:name="private:resource/toolbar/textstylebar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Formatting (Styles)</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ </node>
</node>
</node>
</oor:component-data>
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk
index f718b967f81a..4ea7ae841b6c 100644
--- a/sw/UIConfig_sglobal.mk
+++ b/sw/UIConfig_sglobal.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sglobal,\
sw/uiconfig/sglobal/toolbar/symbolshapes \
sw/uiconfig/sglobal/toolbar/tableobjectbar \
sw/uiconfig/sglobal/toolbar/textobjectbar \
+ sw/uiconfig/sglobal/toolbar/textstylebar \
sw/uiconfig/sglobal/toolbar/toolbar \
sw/uiconfig/sglobal/toolbar/viewerbar \
))
diff --git a/sw/uiconfig/sglobal/toolbar/textstylebar.xml b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
new file mode 100644
index 000000000000..7aa997f75984
--- /dev/null
+++ b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
@@ -0,0 +1,92 @@
+<?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:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleUpdateByExample"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleNewByExample"/>
+ <toolbar:toolbaritem xlink:href=".uno:EditStyle"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:visible="false"/>
+ <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:DefaultParaStyle" toolbar:text="Default"/>
+ <toolbar:toolbaritem xlink:href=".uno:TitleParaStyle" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SubtitleParaStyle" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Heading1ParaStyle" toolbar:text="H1"/>
+ <toolbar:toolbaritem xlink:href=".uno:Heading2ParaStyle" toolbar:text="H2"/>
+ <toolbar:toolbaritem xlink:href=".uno:Heading3ParaStyle" toolbar:text="H3"/>
+ <toolbar:toolbaritem xlink:href=".uno:Heading4ParaStyle" toolbar:text="H4" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Heading5ParaStyle" toolbar:text="H5" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Heading6ParaStyle" toolbar:text="H6" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:TextBodyParaStyle" toolbar:text="Text"/>
+ <toolbar:toolbaritem xlink:href=".uno:QuoteParaStyle" toolbar:text="Quote"/>
+ <toolbar:toolbaritem xlink:href=".uno:PreformattedParaStyle" toolbar:text="Pre"/>
+ <toolbar:toolbarseparator/>
+ <!-- These commands can be enabled when tdf#88512 and tdf#106782 are fixed -->
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:text="Character Styles" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleUpdateByExample" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleNewByExample" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EditStyle" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultCharStyle" toolbar:text="Default"/>
+ <toolbar:toolbaritem xlink:href=".uno:EmphasisCharStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:StrongEmphasisCharStyle" toolbar:text="Strong"/>
+ <toolbar:toolbaritem xlink:href=".uno:QuoteCharStyle" toolbar:text="Quote" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SourceCharStyle" toolbar:text="Code"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=User Entry&amp;FamilyName:string=CharacterStyles" toolbar:text="User" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnderlineSimple" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Strikeout"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FontColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackColor"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
+ <toolbar:toolbarseparator/>
+ <!-- These command can be enabled when tdf#107000 is fixed -->
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:text="List Styles" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BulletListStyle" toolbar:text="Bullet"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberListStyle" toolbar:text="Number"/>
+ <toolbar:toolbaritem xlink:href=".uno:RomanListStyle" toolbar:text="Roman"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:LineSpacing"/>
+ <toolbar:toolbaritem xlink:href=".uno:Spacing" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:visible="false"/>
+</toolbar:toolbar>