diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-04-06 13:22:26 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-04-06 13:51:42 +0200 |
| commit | e4f53484d255f844169957c411dc3e872af7d3bb (patch) | |
| tree | 3eda6b7efe197c71d83ba10335fffba479249649 /cui/source | |
| parent | 2f4d577e60a934e2845c90e00bac06072351ec65 (diff) | |
tdf#148413: Drop HTML export encoding configuration; use UTF-8
Anything else is just a joke today.
Change-Id: Ie6a0cec1edcd257cbadef702018e6a919e6a0b44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132628
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/options/opthtml.cxx | 12 | ||||
| -rw-r--r-- | cui/source/options/opthtml.hxx | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 5fb93652b9a9..18e3beceb8ef 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -40,7 +40,6 @@ OfaHtmlTabPage::OfaHtmlTabPage(weld::Container* pPage, weld::DialogController* p , m_xStarBasicWarningCB(m_xBuilder->weld_check_button("starbasicwarning")) , m_xPrintExtensionCB(m_xBuilder->weld_check_button("printextension")) , m_xSaveGrfLocalCB(m_xBuilder->weld_check_button("savegrflocal")) - , m_xCharSetLB(new SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset"))) { // replace placeholder with UI string from language list OUString aText(m_xNumbersEnglishUSCB->get_label()); @@ -57,9 +56,6 @@ OfaHtmlTabPage::OfaHtmlTabPage(weld::Container* pPage, weld::DialogController* p } m_xStarBasicCB->connect_toggled(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl)); - - // initialize the characterset listbox - m_xCharSetLB->FillWithMimeAndSelectBest(); } OfaHtmlTabPage::~OfaHtmlTabPage() @@ -125,10 +121,6 @@ bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) officecfg::Office::Common::Filter::HTML::Export::PrintLayout::set( m_xPrintExtensionCB->get_active(), xChanges); - if( m_xCharSetLB->GetSelectTextEncoding() != SvxHtmlOptions::GetTextEncoding() ) - officecfg::Office::Common::Filter::HTML::Export::Encoding::set( - m_xCharSetLB->GetSelectTextEncoding(), xChanges ); - xChanges->commit(); return false; } @@ -166,10 +158,6 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* ) m_xNumbersEnglishUSCB->save_state(); m_xUnknownTagCB->save_state(); m_xIgnoreFontNamesCB->save_state(); - - if( !SvxHtmlOptions::IsDefaultTextEncoding() && - m_xCharSetLB->GetSelectTextEncoding() != SvxHtmlOptions::GetTextEncoding() ) - m_xCharSetLB->SelectTextEncoding( SvxHtmlOptions::GetTextEncoding() ); } IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, weld::Toggleable&, rBox, void) diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 4fdb9d754451..33bff167b87a 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -40,7 +40,6 @@ class OfaHtmlTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xStarBasicWarningCB; std::unique_ptr<weld::CheckButton> m_xPrintExtensionCB; std::unique_ptr<weld::CheckButton> m_xSaveGrfLocalCB; - std::unique_ptr<SvxTextEncodingBox> m_xCharSetLB; DECL_LINK(CheckBoxHdl_Impl, weld::Toggleable&, void); |