tdf#107915 Add paragraph and character style aliases

Change-Id: I4fc94b92ec0573147c5f2737107b52e85e55cb4f
Reviewed-on: https://gerrit.libreoffice.org/38009
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>

11 files changed, 126 insertions, 27 deletions

diff --git a/icon-themes/tango/cmd/lc_emphasischarstyle.png b/icon-themes/tango/cmd/lc_emphasischarstyle.png
new file mode 100644
index 000000000000..b33b0301b881
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_emphasischarstyle.png
diff --git a/icon-themes/tango/cmd/lc_heading1parastyle.png b/icon-themes/tango/cmd/lc_heading1parastyle.png
new file mode 100644
index 000000000000..0bef4e9fd252
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_heading1parastyle.png
diff --git a/icon-themes/tango/cmd/lc_heading2parastyle.png b/icon-themes/tango/cmd/lc_heading2parastyle.png
new file mode 100644
index 000000000000..4a1abff091f3
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_heading2parastyle.png
diff --git a/icon-themes/tango/cmd/lc_heading3parastyle.png b/icon-themes/tango/cmd/lc_heading3parastyle.png
new file mode 100644
index 000000000000..fe6154e03b22
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_heading3parastyle.png
diff --git a/icon-themes/tango/cmd/lc_preformattedparastyle.png b/icon-themes/tango/cmd/lc_preformattedparastyle.png
new file mode 100644
index 000000000000..7b41828bfbb5
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_preformattedparastyle.png
diff --git a/icon-themes/tango/cmd/lc_quoteparastyle.png b/icon-themes/tango/cmd/lc_quoteparastyle.png
new file mode 100644
index 000000000000..42eadc537b06
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_quoteparastyle.png
diff --git a/icon-themes/tango/cmd/lc_sourcecharstyle.png b/icon-themes/tango/cmd/lc_sourcecharstyle.png
new file mode 100644
index 000000000000..ab7f92463e24
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_sourcecharstyle.png
diff --git a/icon-themes/tango/cmd/lc_strongemphasischarstyle.png b/icon-themes/tango/cmd/lc_strongemphasischarstyle.png
new file mode 100644
index 000000000000..b1f433af7afa
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_strongemphasischarstyle.png
diff --git a/icon-themes/tango/cmd/lc_textbodyparastyle.png b/icon-themes/tango/cmd/lc_textbodyparastyle.png
new file mode 100644
index 000000000000..87b4fa4de92f
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_textbodyparastyle.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 73361c870388..0b980cca5a5f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2757,25 +2757,16 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Horizontal ~Line</value>
         </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
       </node>
       <node oor:name=".uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Default ~Paragraph</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>
-        <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">
@@ -2789,6 +2780,17 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Heading ~1</value>
         </prop>
+      </node>
+      <node oor:name=".uno:Heading1ParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Heading ~1</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Heading 1 Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -2797,6 +2799,17 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Heading ~2</value>
         </prop>
+      </node>
+      <node oor:name=".uno:Heading2ParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Heading ~2</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Heading 2 Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -2805,6 +2818,17 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Heading ~3</value>
         </prop>
+      </node>
+      <node oor:name=".uno:Heading3ParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Heading ~3</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Heading 3 Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -2813,41 +2837,74 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Heading ~4</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>
-        <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>
-        <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>
         </prop>
       </node>
+      <node oor:name=".uno:QuoteParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Quotations</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Quotations Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Quotations&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=Preformatted Text&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Pre~formatted Text</value>
         </prop>
       </node>
+      <node oor:name=".uno:PreformattedParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Pre~formatted Text</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Preformatted Text Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Preformatted Text&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=Text body&amp;FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Text Body</value>
         </prop>
       </node>
+      <node oor:name=".uno:TextBodyParaStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Text Body</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Text Body Paragraph Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Text Body&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=Default Style&amp;FamilyName:string=CharacterStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Default ~Character</value>
@@ -2858,11 +2915,39 @@
           <value xml:lang="en-US">E~mphasis</value>
         </prop>
       </node>
+      <node oor:name=".uno:EmphasisCharStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">E~mphasis</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Emphasis Character Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Emphasis&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=Strong Emphasis&amp;FamilyName:string=CharacterStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Strong Emphasis</value>
         </prop>
       </node>
+      <node oor:name=".uno:StrongEmphasisCharStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Strong Emphasis</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Strong Emphasis Character Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Strong Emphasis&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=Quotation&amp;FamilyName:string=CharacterStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Qu~otation</value>
@@ -2873,6 +2958,20 @@
           <value xml:lang="en-US">Sou~rce Text</value>
         </prop>
       </node>
+      <node oor:name=".uno:SourceCharStyle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Sou~rce Text</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Source Text Character Style</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:StyleApply?Style:string=Source Text&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=List 1&amp;FamilyName:string=NumberingStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Bullet List</value>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index b32feadf8054..899daeb4384c 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -34,15 +34,15 @@
  <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:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles" toolbar:text="H1"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles" toolbar:text="H2"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles" toolbar:text="H3"/>
+ <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:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles" toolbar:text="Text"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles" toolbar:text="Quote"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Preformatted Text&amp;FamilyName:string=ParagraphStyles" toolbar:text="Pre"/>
+ <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"/>
@@ -51,10 +51,10 @@
  <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:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles" toolbar:text="Strong"/>
+ <toolbar:toolbaritem xlink:href=".uno:EmphasisCharStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:StrongEmphasisCharStyle" toolbar:text="Strong"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Quotation&amp;FamilyName:string=CharacterStyles" toolbar:text="Quote" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles" toolbar:text="Code"/>
+ <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"/>