[Libreoffice-commits] core.git: svx/source sw/source

[Libreoffice Gerrit user]

 svx/source/dialog/txencbox.cxx   |    4 +++-
 sw/source/ui/dialog/ascfldlg.cxx |    2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9aada6df968b8148f659c5949a0c20fe9cfe69c1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 13 10:37:19 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Aug 13 14:12:32 2018 +0200

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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 )
 {
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 01a5f1139982..5c780926ae43 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -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 )