[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig

[Seth Chaiklin (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |    9 +++++++--
 sw/uiconfig/sglobal/toolbar/textstylebar.xml                        |    6 +++---
 sw/uiconfig/swriter/toolbar/textstylebar.xml                        |    6 +++---
 3 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit f3d39d9a8502ae678a4eedfb73d1efc49104d7dc
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Fri Jan 1 18:12:26 2021 +0100
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Wed Jan 13 14:27:45 2021 +0100

    tdf#136686  Improve toolbar label for "Strong Emphasis" character style
    
        tdf#136686 demonstrates the confusion that arises, if one is
        not familiar with the HTML convention of "strong emphasis"
    
        * remove "Strong" label in "Styles formatting toolbar"so that
          "Strong Emphasis" appears in Toolbar Customization.
        * remove "Default" label in "Styles formatting toolbar"so that
          "Default Character" appears in Toolbar Customization.
          (reflecting change to distinguish Default Character from
           Default Paragraph)
        * remove "Quote" label in "Styles formatting toolbar"so that
          "Quotation" appears in Toolbar Customization.
        * add "Table" to "Default Table Style" (reflecting change to
          differentiate Default Styles)
        * Add tooltips for "Strong Emphasis" and "Quotation" CS
    
        These changes should also result in identical label appearance
        in both Menus customization and Toolbar customization.
    
    Change-Id: I588cdcba51ab6b8ab1e8a44de577ebe7d4f4658d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108577
    Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
    Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 0c593f09373f..1f6ed2730309 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -127,7 +127,6 @@
         <prop oor:name="TooltipLabel" oor:type="xs:string">
           <value xml:lang="en-US">Insert Endnote</value>
         </prop>
-
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -3454,6 +3453,9 @@
         <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>
       </node>
       <node oor:name=".uno:StrongEmphasisCharStyle" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -3473,6 +3475,9 @@
         <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>
       </node>
       <node oor:name=".uno:QuoteCharStyle" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -3609,7 +3614,7 @@
       </node>
       <node oor:name=".uno:StyleApply?Style:string=Default Style&FamilyName:string=TableStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Default Style</value>
+          <value xml:lang="en-US">Default Table Style</value>
         </prop>
       </node>
       <node oor:name=".uno:StyleApply?Style:string=Academic&FamilyName:string=TableStyles" oor:op="replace">
diff --git a/sw/uiconfig/sglobal/toolbar/textstylebar.xml b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
index 5183383c00d5..e3886e115a0d 100644
--- a/sw/uiconfig/sglobal/toolbar/textstylebar.xml
+++ b/sw/uiconfig/sglobal/toolbar/textstylebar.xml
@@ -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:DefaultCharStyle" toolbar:text="Default"/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultCharStyle"/>
  <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:StrongEmphasisCharStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:QuoteCharStyle" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:SourceCharStyle" toolbar:text="Code"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=User Entry&FamilyName:string=CharacterStyles" toolbar:text="User" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 70a6e12ee629..c46ba8d16286 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -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:DefaultCharStyle" toolbar:text="Default"/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultCharStyle"/>
  <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:StrongEmphasisCharStyle"/>
+ <toolbar:toolbaritem xlink:href=".uno:QuoteCharStyle" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:SourceCharStyle" toolbar:text="Code"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=User Entry&FamilyName:string=CharacterStyles" toolbar:text="User" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>