summaryrefslogtreecommitdiff
path: root/editeng/inc
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/inc')
-rw-r--r--editeng/inc/editattr.hxx10
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx2
2 files changed, 6 insertions, 6 deletions
diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx
index 7c9215d22544..85df8454dccc 100644
--- a/editeng/inc/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -22,7 +22,7 @@
#include <editeng/eeitem.hxx>
#include <svl/poolitem.hxx>
-#include <o3tl/optional.hxx>
+#include <optional>
#include <tools/color.hxx>
#include <tools/debug.hxx>
@@ -343,8 +343,8 @@ public:
class EditCharAttribField final : public EditCharAttrib
{
OUString aFieldValue;
- o3tl::optional<Color> mxTxtColor;
- o3tl::optional<Color> mxFldColor;
+ std::optional<Color> mxTxtColor;
+ std::optional<Color> mxFldColor;
EditCharAttribField& operator = ( const EditCharAttribField& rAttr ) = delete;
@@ -358,8 +358,8 @@ public:
{ return !(operator == ( rAttr ) ); }
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
- o3tl::optional<Color>& GetTextColor() { return mxTxtColor; }
- o3tl::optional<Color>& GetFieldColor() { return mxFldColor; }
+ std::optional<Color>& GetTextColor() { return mxTxtColor; }
+ std::optional<Color>& GetFieldColor() { return mxFldColor; }
const OUString& GetFieldValue() const { return aFieldValue;}
void SetFieldValue(const OUString& rVal);
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index d791b5f23b7f..fb8bf634ae80 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -203,7 +203,7 @@
#include <i18nutil/transliteration.hxx>
#include <libxml/xmlwriter.h>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/optional.hxx>
+#include <optional>
#include <o3tl/safeint.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>