tdf#168025 Fix style spotlight numbers in styles list do not always
match style spotlight numbers in document view
This is a partial revert of commit
b5e366c97d
Change-Id: I016f8039d9b8e228afe26231a565679320c1f726
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191373
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
This commit is contained in:
@@ -438,8 +438,13 @@ void StyleList::UpdateFamily()
|
||||
m_bTreeDrag = true;
|
||||
if (m_pStyleSheetPool)
|
||||
{
|
||||
UpdateStyles(StyleFlags::UpdateFamily | StyleFlags::UpdateFamilyList);
|
||||
FillTreeBox(GetActualFamily());
|
||||
if (!m_xTreeBox->get_visible())
|
||||
UpdateStyles(StyleFlags::UpdateFamily | StyleFlags::UpdateFamilyList);
|
||||
else
|
||||
{
|
||||
UpdateStyles(StyleFlags::UpdateFamily);
|
||||
FillTreeBox(GetActualFamily());
|
||||
}
|
||||
}
|
||||
|
||||
InvalidateBindings();
|
||||
@@ -1935,8 +1940,12 @@ void StyleList::Update()
|
||||
}
|
||||
|
||||
m_nAppFilter = pItem->GetValue();
|
||||
UpdateStyles(StyleFlags::UpdateFamilyList);
|
||||
FillTreeBox(GetActualFamily());
|
||||
if (!m_xTreeBox->get_visible())
|
||||
{
|
||||
UpdateStyles(StyleFlags::UpdateFamilyList);
|
||||
}
|
||||
else
|
||||
FillTreeBox(GetActualFamily());
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1948,8 +1957,10 @@ void StyleList::Update()
|
||||
&& m_nAppFilter != pItem->GetValue())
|
||||
{
|
||||
m_nAppFilter = pItem->GetValue();
|
||||
UpdateStyles(StyleFlags::UpdateFamilyList);
|
||||
FillTreeBox(GetActualFamily());
|
||||
if (!m_xTreeBox->get_visible())
|
||||
UpdateStyles(StyleFlags::UpdateFamilyList);
|
||||
else
|
||||
FillTreeBox(GetActualFamily());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user