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

[Maxim Monastirsky]

 svx/source/tbxctrls/linectrl.cxx |    2 +-
 svx/uiconfig/ui/sidebarline.ui   |   13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

New commits:
commit 78cdc474893902395cee98bced32bf214c78ed7f
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Fri Oct 21 11:03:55 2016 +0300

    Arrow style dropdown was applying the wrong line ends
    
    Regression of:
    
    commit 2b68e03348b3b4009e8bb2af7979de36bd3450c5
    Date:   Mon Aug 15 09:19:35 2016 +0200
    
        tdf#100782 have XPropertyList hold unique_ptr
    
    Change-Id: Ib2bb4c25f93de45823aba43aa7c04075283d4097

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 5d5a2f5..98d3ffb 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -322,7 +322,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl, ValueSet*, void)
     }
     else // end of line
     {
-        const XLineEndEntry* pEntry = pLineEndList->GetLineEnd( (nId - 1) / 2 );
+        const XLineEndEntry* pEntry = pLineEndList->GetLineEnd( nId / 2 - 2 );
         pLineEndItem.reset(new XLineEndItem(pEntry->GetName(), pEntry->GetLineEnd()));
     }
 
commit 199a449e2a045e30f1f742ae6f38bf71ecb168c1
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Fri Oct 21 10:25:39 2016 +0300

    Silence warning
    
    warn:vcl.layout:32414:1:vcl/source/window/builder.cxx:3100:
    unknown class
    
    Change-Id: I8019f8568b33f5a67c0acedb962d991cc1c93a1a

diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 43af15e..9e0e01d 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -2,7 +2,7 @@
 <!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
-  <!-- interface-requires LibreOffice 1.0 -->
+  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="step_increment">10</property>
@@ -288,12 +288,6 @@
                             <property name="AtkObject::accessible-name" translatable="yes">Corner Style</property>
                           </object>
                         </child>
-                        <style>
-                          <class name="Rounded"/>
-                          <class name="- none -"/>
-                          <class name="Mitered"/>
-                          <class name="Beveled"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -334,11 +328,6 @@
                             <property name="AtkObject::accessible-name" translatable="yes">Cap Style</property>
                           </object>
                         </child>
-                        <style>
-                          <class name="Flat"/>
-                          <class name="Round"/>
-                          <class name="Square"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>