mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#141441 get and set selected entry when "unfrozen"

Browse Source 
Change-Id: I4229460fb27ae3dc133c0f6a53c7792a87bf4db3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133389
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2022-04-25 15:55:31 +01:00
parent b971167910
commit cf1a41c45a
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
svtools/source/control/ctrlbox.cxx
View File

@ -844,9 +844,10 @@ FontStyleBox::FontStyleBox(std::unique_ptr<weld::ComboBox> p)
void FontStyleBox::Fill( std::u16string_view rName, const FontList* pList ) void FontStyleBox::Fill( std::u16string_view rName, const FontList* pList )
{ {
m_xComboBox->freeze();
OUString aOldText = m_xComboBox->get_active_text(); OUString aOldText = m_xComboBox->get_active_text();
int nPos = m_xComboBox->get_active(); int nPos = m_xComboBox->get_active();
m_xComboBox->freeze();
m_xComboBox->clear(); m_xComboBox->clear();
// does a font with this name already exist? // does a font with this name already exist?
@ -949,19 +950,6 @@ void FontStyleBox::Fill( std::u16string_view rName, const FontList* pList )
if ( bNormal || bItalic || bBold ) if ( bNormal || bItalic || bBold )
m_xComboBox->append_text(pList->GetBoldItalicStr()); m_xComboBox->append_text(pList->GetBoldItalicStr());
} }
if (!aOldText.isEmpty())
{
int nFound = m_xComboBox->find_text(aOldText);
if (nFound != -1)
m_xComboBox->set_active(nFound);
else
{
if (nPos >= m_xComboBox->get_count())
m_xComboBox->set_active(0);
else
m_xComboBox->set_active(nPos);
}
}
} }
else else
{ {
@ -970,7 +958,16 @@ void FontStyleBox::Fill( std::u16string_view rName, const FontList* pList )
m_xComboBox->append_text(pList->GetItalicStr()); m_xComboBox->append_text(pList->GetItalicStr());
m_xComboBox->append_text(pList->GetBoldStr()); m_xComboBox->append_text(pList->GetBoldStr());
m_xComboBox->append_text(pList->GetBoldItalicStr()); m_xComboBox->append_text(pList->GetBoldItalicStr());
if (!aOldText.isEmpty()) }
m_xComboBox->thaw();
if (!aOldText.isEmpty())
{
int nFound = m_xComboBox->find_text(aOldText);
if (nFound != -1)
m_xComboBox->set_active(nFound);
else
{ {
if (nPos >= m_xComboBox->get_count()) if (nPos >= m_xComboBox->get_count())
m_xComboBox->set_active(0); m_xComboBox->set_active(0);
@ -978,7 +975,6 @@ void FontStyleBox::Fill( std::u16string_view rName, const FontList* pList )
m_xComboBox->set_active(nPos); m_xComboBox->set_active(nPos);
} }
} }
m_xComboBox->thaw();
} }
FontSizeBox::FontSizeBox(std::unique_ptr<weld::ComboBox> p) FontSizeBox::FontSizeBox(std::unique_ptr<weld::ComboBox> p)