diff options
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/inc/pch/precompiled_cui.hxx | 2 | ||||
| -rw-r--r-- | cui/source/options/fontsubs.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/tsaurls.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 25c8af7e7414..1860efb7f1da 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -284,7 +284,7 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> -#include <o3tl/optional.hxx> +#include <optional> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index d9d4debec894..d6e724fa4a95 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -178,7 +178,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) if (m_xFontNameLB->get_active() != -1) sFontName = m_xFontNameLB->get_active_text(); officecfg::Office::Common::Font::SourceViewFont::FontName::set( - o3tl::optional< OUString >(sFontName), batch); + std::optional< OUString >(sFontName), batch); batch->commit(); return false; diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index 6fc5ad50d55d..62f08298db8e 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -35,7 +35,7 @@ TSAURLsDialog::TSAURLsDialog(weld::Window* pParent) try { - o3tl::optional<css::uno::Sequence<OUString>> aUserSetTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get()); + std::optional<css::uno::Sequence<OUString>> aUserSetTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get()); if (aUserSetTSAURLs) { const css::uno::Sequence<OUString>& rUserSetTSAURLs = *aUserSetTSAURLs; |