From f9cbf67fb2cf817b6d201604eb7d4bf6182a1392 Mon Sep 17 00:00:00 2001
From: Yousuf Philips <philipz85@hotmail.com>
Date: Fri, 15 Sep 2017 23:32:43 +0400
Subject: tdf#107915 More paragraph and character style aliases

Change-Id: I87cd64d1ba3cb370d5a967e790a92ce393fb9457
Reviewed-on: https://gerrit.libreoffice.org/41919
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
---
 .../lc_defaultbullet-lc_defaultnumbering.xcf.bz2   | Bin 0 -> 4917 bytes
 icon-themes/tango/cmd/lc_romanliststyle.png        | Bin 0 -> 361 bytes
 icon-themes/tango/links.txt                        |   4 +
 .../org/openoffice/Office/UI/WriterCommands.xcu    | 154 +++++++++++++++++++++
 sw/uiconfig/swriter/toolbar/textstylebar.xml       |  22 +--
 5 files changed, 169 insertions(+), 11 deletions(-)
 create mode 100644 icon-themes/tango/cmd/lc_defaultbullet-lc_defaultnumbering.xcf.bz2
 create mode 100644 icon-themes/tango/cmd/lc_romanliststyle.png

diff --git a/icon-themes/tango/cmd/lc_defaultbullet-lc_defaultnumbering.xcf.bz2 b/icon-themes/tango/cmd/lc_defaultbullet-lc_defaultnumbering.xcf.bz2
new file mode 100644
index 000000000000..784ce53c9746
Binary files /dev/null and b/icon-themes/tango/cmd/lc_defaultbullet-lc_defaultnumbering.xcf.bz2 differ
diff --git a/icon-themes/tango/cmd/lc_romanliststyle.png b/icon-themes/tango/cmd/lc_romanliststyle.png
new file mode 100644
index 000000000000..d36d75a899b3
Binary files /dev/null and b/icon-themes/tango/cmd/lc_romanliststyle.png differ
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 54ecb6575daf..940ed7b45aaa 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -604,3 +604,7 @@ cmd/sc_rowoperations.png cmd/sc_entirerow.png
 
 cmd/sc_cellprotection.png cmd/sc_protect.png
 cmd/lc_cellprotection.png cmd/lc_protect.png
+
+# formtting style toolbar
+cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
+cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index adedee8965f2..cf59c7ab5429 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2765,11 +2765,39 @@
           <value xml:lang="en-US">Default ~Paragraph</value>
         </prop>
       </node>
+      <node oor:name=".uno:DefaultParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Default ~Paragraph</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Default Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Title</value>
         </prop>
       </node>
+      <node oor:name=".uno:TitleParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Title</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Title Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Su~btitle</value>
@@ -2778,6 +2806,20 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:SubtitleParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Su~btitle</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Subtitle Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Heading ~1</value>
@@ -2840,16 +2882,58 @@
           <value xml:lang="en-US">Heading ~4</value>
         </prop>
       </node>
+      <node oor:name=".uno:Heading4ParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Heading ~4</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Heading 4 Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Heading 5&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Heading ~5</value>
         </prop>
       </node>
+      <node oor:name=".uno:Heading5ParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Heading ~5</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Heading 5 Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Heading 5&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Heading 6&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Heading ~6</value>
         </prop>
       </node>
+      <node oor:name=".uno:Heading6ParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Heading ~6</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Heading 6 Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Heading 6&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Quotations</value>
@@ -2912,6 +2996,20 @@
           <value xml:lang="en-US">Default ~Character</value>
         </prop>
       </node>
+      <node oor:name=".uno:DefaultCharStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Default ~Character</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Default Character Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">E~mphasis</value>
@@ -2955,6 +3053,20 @@
           <value xml:lang="en-US">Qu~otation</value>
         </prop>
       </node>
+      <node oor:name=".uno:QuoteCharStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Qu~otation</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Quotation Character Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Citation&amp;FamilyName:string=CharacterStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Sou~rce Text</value>
@@ -2979,16 +3091,58 @@
           <value xml:lang="en-US">Bullet List</value>
         </prop>
       </node>
+      <node oor:name=".uno:BulletListStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Bullet List</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Bullet List Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Number List</value>
         </prop>
       </node>
+      <node oor:name=".uno:NumberListStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Number List</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Number List Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Roman List</value>
         </prop>
       </node>
+      <node oor:name=".uno:RomanListStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Roman List</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Roman List Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleApply" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Paragraph Style</value>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index f02451f1c456..13b65c7eec47 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -31,15 +31,15 @@
  <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:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles" toolbar:text="Default" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultParaStyle" toolbar:text="Default" toolbar:visible="false"/>
+ <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:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles" toolbar:text="H4" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 5&amp;FamilyName:string=ParagraphStyles" toolbar:text="H5" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 6&amp;FamilyName:string=ParagraphStyles" toolbar:text="H6" toolbar:visible="false"/>
+ <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"/>
@@ -50,10 +50,10 @@
  <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:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles" toolbar:text="Default"/>
+ <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:StyleApply?Style:string=Citation&amp;FamilyName:string=CharacterStyles" toolbar:text="Quote" toolbar:visible="false"/>
+ <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/>
@@ -73,9 +73,9 @@
  <!-- 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:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles" toolbar:text="Bullet"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles" toolbar:text="Number"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles" toolbar:text="Roman"/>
+ <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:DefaultBullet" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
-- 
cgit v1.2.3