diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-07-28 19:40:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-28 22:18:55 +0200 |
| commit | 56b2214c3aa40c2e2522eba5584063fb34e003ba (patch) | |
| tree | 5668e4bd0836553a575e599ddfeadd072b4b0e8c /cui/source/options | |
| parent | 9b2dce4518db89cadbd54a34d1f6375128c3c8a6 (diff) | |
drop use of SvtFontOptions
Change-Id: Ib3ef6ec415d5e61d484e338290030fac2ed7b215
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99647
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/options')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 64a85add8440..f9bccb5222d4 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -31,7 +31,6 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <unotools/compatibility.hxx> -#include <unotools/fontoptions.hxx> #include <svtools/menuoptions.hxx> #include <svl/languageoptions.hxx> #include <svtools/miscopt.hxx> @@ -801,7 +800,6 @@ std::unique_ptr<SfxTabPage> OfaViewTabPage::Create( weld::Container* pPage, weld bool OfaViewTabPage::FillItemSet( SfxItemSet* ) { - SvtFontOptions aFontOpt; SvtMenuOptions aMenuOpt; bool bModified = false; @@ -905,7 +903,9 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) if (m_xFontShowCB->get_state_changed_from_saved()) { - aFontOpt.EnableFontWYSIWYG(m_xFontShowCB->get_active()); + std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); + officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::set(m_xFontShowCB->get_active(), batch); + batch->commit(); bModified = true; } @@ -1060,8 +1060,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) m_xAAPointLimit->set_value(pAppearanceCfg->GetFontAntialiasingMinPixelHeight(), FieldUnit::PIXEL); // WorkingSet - SvtFontOptions aFontOpt; - m_xFontShowCB->set_active( aFontOpt.IsFontWYSIWYGEnabled() ); + m_xFontShowCB->set_active(officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::get()); SvtMenuOptions aMenuOpt; m_xMenuIconsLB->set_active(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1); m_xMenuIconsLB->save_value(); |