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

Reslves: tdf#119212 sort character sets

and save useritem

Change-Id: I92f00bd982ab00571148c0e74cd9c8772451a246
Reviewed-on: https://gerrit.libreoffice.org/58920
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst ab76a889
......@@ -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 )
{
......
......@@ -251,6 +251,8 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh,
SwAsciiFilterDlg::~SwAsciiFilterDlg()
{
SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8));
aDlgOpt.SetUserItem("UserItem", uno::makeAny(m_sExtraData));
}
void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions )
......
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