diff options
Diffstat (limited to 'sc/source/filter/inc')
| -rw-r--r-- | sc/source/filter/inc/eeparser.hxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/inc/lotfntbf.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlpivot.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 90fe0960a810..dbd0cbd56137 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -24,7 +24,7 @@ #include <vcl/graph.hxx> #include <svl/itemset.hxx> #include <editeng/editdata.hxx> -#include <o3tl/optional.hxx> +#include <optional> #include <address.hxx> #include <memory> #include <vector> @@ -52,11 +52,11 @@ struct ScEEParseEntry { SfxItemSet aItemSet; ESelection aSel; // Selection in EditEngine - o3tl::optional<OUString> + std::optional<OUString> pValStr; // HTML possibly SDVAL string - o3tl::optional<OUString> + std::optional<OUString> pNumStr; // HTML possibly SDNUM string - o3tl::optional<OUString> + std::optional<OUString> pName; // HTML possibly anchor/RangeName OUString aAltText; // HTML IMG ALT Text std::vector< std::unique_ptr<ScHTMLImage> > maImageList; // graphics in this cell diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 8fa9a5c56522..4483b645a643 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -22,7 +22,7 @@ #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> -#include <o3tl/optional.hxx> +#include <optional> // Code in fontbuff.cxx (excel) @@ -31,7 +31,7 @@ class LotusFontBuffer private: struct ENTRY { - o3tl::optional<OUString> xTmpName; + std::optional<OUString> xTmpName; std::unique_ptr<SvxFontItem> pFont; std::unique_ptr<SvxFontHeightItem> pHeight; sal_Int32 nType = -1; // < 0 -> undefined diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index c0df275cab24..2e784cef8d42 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -26,7 +26,7 @@ #include "xladdress.hxx" #include <dpobject.hxx> -#include <o3tl/optional.hxx> +#include <optional> class XclImpStream; class XclExpStream; @@ -624,7 +624,7 @@ struct XclPTFieldExtInfo sal_uInt16 mnSortField; /// Index to data field sorting bases on. sal_uInt16 mnShowField; /// Index to data field AutoShow bases on. sal_uInt16 mnNumFmt; - o3tl::optional<OUString> mpFieldTotalName; + std::optional<OUString> mpFieldTotalName; explicit XclPTFieldExtInfo(); |