diff options
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.hxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index c7b50dcdc730..154bd0bbc840 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -29,7 +29,7 @@ #include <stack> #include <unordered_map> #include <vector> -#include <o3tl/optional.hxx> +#include <optional> #include "DomainMapper.hxx" #include "DomainMapperTableManager.hxx" @@ -156,7 +156,7 @@ class FieldContext : public virtual SvRefBase OUString m_sCommand; OUString m_sResult; - o3tl::optional<FieldId> m_eFieldId; + std::optional<FieldId> m_eFieldId; bool m_bFieldLocked; css::uno::Reference<css::text::XTextField> m_xTextField; @@ -186,7 +186,7 @@ public: const OUString& GetCommand() const {return m_sCommand; } void SetFieldId(FieldId eFieldId ) { m_eFieldId = eFieldId; } - o3tl::optional<FieldId> const & GetFieldId() const { return m_eFieldId; } + std::optional<FieldId> const & GetFieldId() const { return m_eFieldId; } void AppendResult(OUString const& rResult) { m_sResult += rResult; } const OUString& GetResult() const { return m_sResult; } @@ -440,7 +440,7 @@ private: css::uno::Reference<css::uno::XComponentContext> m_xComponentContext; css::uno::Reference<css::container::XNameContainer> m_xPageStyles1; // cache next available number, expensive to repeatedly compute - o3tl::optional<int> m_xNextUnusedPageStyleNo; + std::optional<int> m_xNextUnusedPageStyleNo; css::uno::Reference<css::text::XText> m_xBodyText; css::uno::Reference<css::text::XTextContent> m_xEmbedded; @@ -977,7 +977,7 @@ public: tools::SvRef<SdtHelper> m_pSdtHelper; /// Document background color, applied to every page style. - o3tl::optional<sal_Int32> m_oBackgroundColor; + std::optional<sal_Int32> m_oBackgroundColor; /** * This contains the raw table depth. m_nTableDepth > 0 is the same as |