diff options
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/pch/precompiled_sm.hxx | 2 | ||||
-rw-r--r-- | starmath/source/accessibility.cxx | 2 | ||||
-rw-r--r-- | starmath/source/accessibility.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index 07bbd9b59988..bc12faddfc78 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.hxx @@ -106,7 +106,7 @@ #include <editeng/editstat.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/optional.hxx> +#include <optional> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <salhelper/simplereferenceobject.hxx> diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 23f4c6cb0a42..e7f0bf900d78 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -997,7 +997,7 @@ bool SmTextForwarder::IsValid() const return pEditEngine && pEditEngine->GetUpdateMode(); } -OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, o3tl::optional<Color>& rpTxtColor, o3tl::optional<Color>& rpFldColor ) +OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, std::optional<Color>& rpTxtColor, std::optional<Color>& rpFldColor ) { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? pEditEngine->CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor) : OUString(); diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index dceff88ae478..60e247973b67 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -197,7 +197,7 @@ public: virtual SfxItemPool* GetPool() const override; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, o3tl::optional<Color>& rpTxtColor, o3tl::optional<Color>& rpFldColor ) override; + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, std::optional<Color>& rpTxtColor, std::optional<Color>& rpFldColor ) override; virtual void FieldClicked(const SvxFieldItem&) override; virtual bool IsValid() const override; |