[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sw/source sw/uiconfig

[Libreoffice Gerrit user]

 sw/source/ui/misc/outline.cxx                  |    1 +
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit a5205b8dfc04343dacc396a0d1e8b5168edd51af
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 17 12:56:02 2012 +0000

    sort style list in outline numbering
    
    Change-Id: I17139da65d0adbdaaa2c7bafb066fc6f74c42700

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 48cfd5c..1d7fc43 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -427,6 +427,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent,
 {
     get(m_pLevelLB, "level");
     get(m_pCollBox, "style");
+    m_pCollBox->SetStyle(m_pCollBox->GetStyle()|WB_SORT);
     get(m_pNumberBox, "numbering");
     get(m_pCharFmtLB, "charstyle");
     get(m_pAllLevelFT, "sublevelsft");
commit e0238a46e0850150e68218734dda86d6bd08523f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Dec 17 12:43:21 2012 +0000

    Resolves: fdo#58284 outline numbering list is of wrong type
    
    Change-Id: Ifb1fa41bef033b4f0624f46a945d5a5c47bada4a
    (cherry picked from commit ec1f1c16e36b1fa5138604ca08fff1888cf7513c)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index fd15817..e488681 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -161,6 +161,7 @@
                           <object class="swlo:SwNumberingTypeListBox" id="numbering">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="type">17</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>