diff options
Diffstat (limited to 'sc/source/filter/xml/XMLStylesImportHelper.hxx')
| -rw-r--r-- | sc/source/filter/xml/XMLStylesImportHelper.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 4a8748ad12ff..45ac02b9a8fd 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -29,7 +29,7 @@ #include <set> #include <map> #include <vector> -#include <o3tl/optional.hxx> +#include <optional> class ScXMLImport; @@ -101,7 +101,7 @@ public: ScMyStyleRanges(); ~ScMyStyleRanges(); void AddRange(const ScRange& rRange, const sal_Int16 nType); - void AddCurrencyRange(const ScRange& rRange, const o3tl::optional<OUString> & pCurrency); + void AddCurrencyRange(const ScRange& rRange, const std::optional<OUString> & pCurrency); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab); void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport); }; @@ -115,13 +115,13 @@ class ScMyStylesImportHelper std::vector<ScMyStylesMap::iterator> aColDefaultStyles; ScMyStylesMap::iterator aRowDefaultStyle; ScXMLImport& rImport; - o3tl::optional<OUString> + std::optional<OUString> pStyleName; - o3tl::optional<OUString> + std::optional<OUString> pPrevStyleName; - o3tl::optional<OUString> + std::optional<OUString> pCurrency; - o3tl::optional<OUString> + std::optional<OUString> pPrevCurrency; ScRange aPrevRange; sal_Int16 nCellType; @@ -138,8 +138,8 @@ public: ~ScMyStylesImportHelper(); void AddColumnStyle(const OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat); void SetRowStyle(const OUString& rStyleName); - void SetAttributes(o3tl::optional<OUString> pStyleName, - o3tl::optional<OUString> pCurrency, const sal_Int16 nCellType); + void SetAttributes(std::optional<OUString> pStyleName, + std::optional<OUString> pCurrency, const sal_Int16 nCellType); void AddRange(const ScRange& rRange); void AddCell(const ScAddress& rAddress); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab); // a col is inserted before nCol |