[Libreoffice-commits] core.git: 2 commits - sd/uiconfig vcl/source

[Caolán McNamara]

 sd/uiconfig/simpress/ui/masterlayoutdlg.ui |   10 +++++++---
 vcl/source/gdi/CommonSalLayout.cxx         |    3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 337b9e63306522ae6bf12114fe673794635e5772
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 30 09:19:04 2018 +0100

    flip masterlayoutdialog action area orientation to standard
    
    Change-Id: Ic1ec6d2c94384b14fe0b6bd7c65ca33d592de19b
    Reviewed-on: https://gerrit.libreoffice.org/53649
    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/sd/uiconfig/simpress/ui/masterlayoutdlg.ui b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
index 6478878434b9..c0471a12d9c8 100644
--- a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
+++ b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.4 -->
 <interface domain="sd">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkDialog" id="MasterLayoutDialog">
@@ -11,12 +11,12 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="layout_style">start</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
@@ -59,6 +59,7 @@
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">2</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
           </object>
@@ -194,5 +195,8 @@
       <action-widget response="-5">ok</action-widget>
       <action-widget response="-6">cancel</action-widget>
     </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
commit 6f488fc5ab32c41566882de58d2cc7a2b74e7337
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 30 09:13:10 2018 +0100

    crashtesting: ooo43029-4.odg initial j of 0 decremented wraps around
    
    since
    
    commit 2815499d7c0b32fa05fcd697e7b2c2d897f78dfb
    Date:   Fri Apr 27 05:21:29 2018 +0200
    
        tdf#105913: Fix applying DX array to ligatures
    
    Change-Id: I989aa70d5e8a99061a1b0e4db63c47c7c92d92da
    Reviewed-on: https://gerrit.libreoffice.org/53647
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 9002d76a7c62..ddb3986b277d 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -945,8 +945,9 @@ void CommonSalLayout::ApplyDXArray(ImplLayoutArgs& rArgs)
 
             // Adjust the X position of all glyphs in the cluster.
             size_t j = i;
-            while (j-- > 0)
+            while (j > 0)
             {
+                --j;
                 if (!m_GlyphItems[j].IsInCluster())
                     break;
                 m_GlyphItems[j].maLinearPos.AdjustX(nDelta + nDiff);