Kaydet (Commit) 9de256db authored tarafından Caolán McNamara's avatar Caolán McNamara

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/63821
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 358d7c56
......@@ -411,7 +411,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));
......@@ -609,9 +608,10 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, weld::ComboBox&, 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];
......@@ -724,6 +724,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
......
......@@ -100,7 +100,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
DECL_LINK( LevelHdl, weld::TreeView&, void );
DECL_LINK( ToggleComplete, weld::SpinButton&, void );
DECL_LINK( CollSelect, weld::ComboBox&, void );
DECL_LINK( CollSelectGetFocus, weld::Widget&, void );
void CollSave();
DECL_LINK( NumberSelect, weld::ComboBox&, void );
DECL_LINK( DelimModify, weld::Entry&, void );
DECL_LINK( StartModified, weld::SpinButton&, void );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment