diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-03-17 09:35:26 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-03-17 07:39:47 +0100 |
| commit | 69b0d194d83aa29008eaffe65f1784d60f57e63c (patch) | |
| tree | 4deb52344d037c2e0e9acaf98f4c4187092af644 /writerfilter | |
| parent | 1fbeba66e823cea043fdd3f4c50d7b90585aaf30 (diff) | |
Fix build
Regression after 2be656908e9f30d0b0f795cc67096f0d673a3a21 that was
tested on 73b6b3b4a22f047718d91a7057dba3a096171976 from Feb 19, which
was older than 9ad252b2e79576119c2d733a1a45fdd9e9f83140 from Feb 21
that dropped o3tl::optional.
Change-Id: I685139e43c6788ca826bcdf4c9baa16a3304c59f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90594
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index cc4311d0aaff..207e1493e09d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -84,6 +84,7 @@ #include <oox/token/tokens.hxx> #include <cmath> +#include <optional> #include <map> #include <tuple> #include <unordered_map> @@ -1766,7 +1767,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con m_aParagraphsToEndTable.push_back(aPending); // hidden empty paragraph with a not hidden shape, set as not hidden - o3tl::optional<PropertyMap::Property> pHidden; + std::optional<PropertyMap::Property> pHidden; if ( !m_aAnchoredObjectAnchors.empty() && (pHidden = pParaContext->getProperty(PROP_CHAR_HIDDEN)) ) { bool bIsHidden; |