summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-08-13 10:37:19 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2018-08-13 21:09:56 +0200
commit1e749e8c7dd59f4c90ec72e2e092cacac71acc40 (patch)
treebba005fab6df148e33d708cefe3901bf6626f056 /svx
parent3b07dfad5df6d7117d6bd29aa30245a6dc515379 (diff)
Reslves: tdf#119212 sort character sets
and save useritem Change-Id: I92f00bd982ab00571148c0e74cd9c8772451a246 Reviewed-on: https://gerrit.libreoffice.org/58922 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/txencbox.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index b4e446aeee3f..4b6adfc28890 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -226,6 +226,7 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc )
TextEncodingBox::TextEncodingBox(weld::ComboBoxText* pControl)
: m_xControl(pControl)
{
+ m_xControl->make_sorted();
}
TextEncodingBox::~TextEncodingBox()
@@ -235,6 +236,7 @@ TextEncodingBox::~TextEncodingBox()
void TextEncodingBox::FillFromTextEncodingTable(
bool bExcludeImportSubsets )
{
+ m_xControl->freeze();
const sal_uInt32 nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE);
for (sal_uInt32 j = 0; j < nCount; ++j)
{
@@ -255,9 +257,9 @@ void TextEncodingBox::FillFromTextEncodingTable(
if ( bInsert )
InsertTextEncoding(nEnc, SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[j].first));
}
+ m_xControl->thaw();
}
-
void TextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
const OUString& rEntry )
{