[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/misc/outline.cxx    |    6 ++++--
 sw/source/uibase/inc/outline.hxx |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d3a79b489adc6a40b3c4063c1ec324d36686853b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 22 16:53:36 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 26 15:39:07 2018 +0100

    tdf#120426 save the style names when set or changed
    
    instead of waiting until gaining focus of the listbox,
    because of the differences in what that focus means in
    the different backends. It was an odd way to do things anyway.
    
    Change-Id: I072e3da04db184b49a86a9888080b60223813729
    Reviewed-on: https://gerrit.libreoffice.org/63822
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index ea75b1761586..c23794861501 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -410,7 +410,6 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(TabPageParent pPage,
     m_xLevelLB->connect_changed(LINK(this,    SwOutlineSettingsTabPage, LevelHdl));
     m_xAllLevelNF->connect_value_changed(LINK(this, SwOutlineSettingsTabPage, ToggleComplete));
     m_xCollBox->connect_changed(LINK(this,    SwOutlineSettingsTabPage, CollSelect));
-    m_xCollBox->connect_focus_in(LINK(this,  SwOutlineSettingsTabPage, CollSelectGetFocus));
     m_xNumberBox->connect_changed(LINK(this,  SwOutlineSettingsTabPage, NumberSelect));
     m_xPrefixED->connect_changed(LINK(this,   SwOutlineSettingsTabPage, DelimModify));
     m_xSuffixED->connect_changed(LINK(this,   SwOutlineSettingsTabPage, DelimModify));
@@ -608,9 +607,10 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, weld::ComboBoxText&, rBox, void
             }
 
     SetModified();
+    CollSave();
 }
 
-IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CollSelectGetFocus, weld::Widget&, void)
+void SwOutlineSettingsTabPage::CollSave()
 {
     for (sal_uInt8 i = 0; i < MAXLEVEL; ++i)
         aSaveCollNames[i] =  pCollNames[i];
@@ -723,6 +723,8 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
     pNumRule = static_cast<SwOutlineTabDialog*>(GetDialogController())->GetNumRule();
     pCollNames = static_cast<SwOutlineTabDialog*>(GetDialogController())->GetCollNames();
 
+    CollSave();
+
     m_aPreviewWIN.SetNumRule(pNumRule);
     m_aPreviewWIN.SetOutlineNames(pCollNames);
     // set start value - nActLevel must be 1 here
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index d009b1d60226..f47d809fe261 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -100,7 +100,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
     DECL_LINK( LevelHdl, weld::TreeView&, void );
     DECL_LINK( ToggleComplete, weld::SpinButton&, void );
     DECL_LINK( CollSelect, weld::ComboBoxText&, void );
-    DECL_LINK( CollSelectGetFocus, weld::Widget&, void );
+    void CollSave();
     DECL_LINK( NumberSelect, weld::ComboBoxText&, void );
     DECL_LINK( DelimModify, weld::Entry&, void );
     DECL_LINK( StartModified, weld::SpinButton&, void );