[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - officecfg/registry sw/uiconfig

[Yousuf Philips]

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

New commits:
commit 9ab228fdd6efe9a7873e3de1bb2357531a79feac
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Sat Jul 29 20:32:08 2017 +0400

    tdf#95489 use internal name for quotation character style
    
    Change-Id: Ie52d1b558480be1c916ea1a0a4bdab26a5b72cb0
    Reviewed-on: https://gerrit.libreoffice.org/40552
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 2eae347df3e7..00cd8e237494 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2830,7 +2830,7 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles" oor:op="replace">
+      <node oor:name=".uno:StyleApply?Style:string=Citation&FamilyName:string=ParagraphStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Quotations</value>
         </prop>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index ab7d4df0721d..4cd2089d6f74 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -578,7 +578,7 @@
       <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" menu:style="radio"/>
-      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" menu:style="radio"/>
       <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles" menu:style="radio"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:StyleApply?Style:string=List 1&FamilyName:string=NumberingStyles" menu:style="radio"/>
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index b32feadf8054..d6dd11eb9b14 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -53,7 +53,7 @@
  <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Default Style&FamilyName:string=CharacterStyles" toolbar:text="Default"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Emphasis&FamilyName:string=CharacterStyles"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Strong Emphasis&FamilyName:string=CharacterStyles" toolbar:text="Strong"/>
- <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles" toolbar:text="Quote" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Citation&FamilyName:string=CharacterStyles" toolbar:text="Quote" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Source Text&FamilyName:string=CharacterStyles" toolbar:text="Code"/>
  <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=User Entry&FamilyName:string=CharacterStyles" toolbar:text="User" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>