summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/source/dialog/txencbox.cxx4
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx2
2 files changed, 5 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 )
{
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 )