diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-08-13 10:37:19 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-13 14:12:32 +0200 |
commit | 9aada6df968b8148f659c5949a0c20fe9cfe69c1 (patch) | |
tree | aa1abe7e0556242dd71f3f5d80aa6bf71e1b2129 /svx | |
parent | ab76a889713661030c5839e5cc04820726a31c38 (diff) |
Reslves: tdf#119212 sort character sets
and save useritem
Change-Id: I92f00bd982ab00571148c0e74cd9c8772451a246
Reviewed-on: https://gerrit.libreoffice.org/58920
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/txencbox.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 9760215ff966..857dfe74e4c1 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -227,6 +227,7 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc ) TextEncodingBox::TextEncodingBox(weld::ComboBoxText* pControl) : m_xControl(pControl) { + m_xControl->make_sorted(); } TextEncodingBox::~TextEncodingBox() @@ -236,6 +237,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) { @@ -256,9 +258,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 ) { |