[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre officecfg/registry

[andreas kainz]

 icon-themes/colibre/links.txt                                        |    7 ++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   24 ++++++++++
 2 files changed, 31 insertions(+)

New commits:
commit 5f423351c3362579ce34c64db5dc5cd66da90678
Author: andreas kainz <kainz.a at gmail.com>
Date:   Mon Jul 2 08:30:58 2018 +0200

    Colibre icons: add icons for Common Align actions
    
    Change-Id: Ia234b76039759d6f71ec6578e7ffa4ff4236dae2
    Reviewed-on: https://gerrit.libreoffice.org/56797
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>
    (cherry picked from commit 2fbcfc8ab619e64642e97aeb2f7a8c8585615d59)
    Reviewed-on: https://gerrit.libreoffice.org/56802

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 0edb2380dc95..5caafc1c11af 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -589,6 +589,13 @@ cmd/sc_cellverttop.png cmd/sc_aligntop.png
 cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png
 cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png
 
+cmd/sc_commonaligntop.png cmd/sc_aligntop.png
+cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png
+cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png
+cmd/lc_commonaligntop.png cmd/lc_aligntop.png
+cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png
+cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png
+
 # paragraph line spacing drop down
 cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c46229b7b5a5..ad609bca111e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6035,41 +6035,65 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Centered</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:CommonAlignRight" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Right</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:CommonAlignTop" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Top</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:CommonAlignVerticalCenter" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Center</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:CommonAlignBottom" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Bottom</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:CommonAlignJustified" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Justified</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:CommonAlignHorizontalDefault" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Default</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:CommonAlignVerticalDefault" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Default</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:RecentFileList" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">