diff options
Diffstat (limited to 'writerfilter/source/rtftok/rtfsdrimport.cxx')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index b0bd39d79830..d32e29fcd167 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -371,14 +371,14 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap uno::Any aLineWidth = uno::makeAny(sal_Int32(26)); sal_Int16 eWritingMode = text::WritingMode2::LR_TB; // Groupshape support - o3tl::optional<sal_Int32> oGroupLeft; - o3tl::optional<sal_Int32> oGroupTop; - o3tl::optional<sal_Int32> oGroupRight; - o3tl::optional<sal_Int32> oGroupBottom; - o3tl::optional<sal_Int32> oRelLeft; - o3tl::optional<sal_Int32> oRelTop; - o3tl::optional<sal_Int32> oRelRight; - o3tl::optional<sal_Int32> oRelBottom; + std::optional<sal_Int32> oGroupLeft; + std::optional<sal_Int32> oGroupTop; + std::optional<sal_Int32> oGroupRight; + std::optional<sal_Int32> oGroupBottom; + std::optional<sal_Int32> oRelLeft; + std::optional<sal_Int32> oRelTop; + std::optional<sal_Int32> oRelRight; + std::optional<sal_Int32> oRelBottom; // Importing these are not trivial, let the VML import do the hard work. oox::vml::FillModel aFillModel; // Gradient. @@ -386,8 +386,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap bool bOpaque = true; - o3tl::optional<sal_Int16> oRelativeWidth; - o3tl::optional<sal_Int16> oRelativeHeight; + std::optional<sal_Int16> oRelativeWidth; + std::optional<sal_Int16> oRelativeHeight; sal_Int16 nRelativeWidthRelation = text::RelOrientation::PAGE_FRAME; sal_Int16 nRelativeHeightRelation = text::RelOrientation::PAGE_FRAME; boost::logic::tribool obRelFlipV(boost::logic::indeterminate); @@ -725,7 +725,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap sal_Int16 nPercentage = rtl::math::round(rProperty.second.toDouble() / 10); if (nPercentage) { - o3tl::optional<sal_Int16>& rPercentage + std::optional<sal_Int16>& rPercentage = rProperty.first == "pctHoriz" ? oRelativeWidth : oRelativeHeight; rPercentage = nPercentage; } |