diff options
Diffstat (limited to 'include/filter/msfilter/svdfppt.hxx')
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index ec50015bb191..9ee6944f1138 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -25,7 +25,7 @@ #include <memory> #include <vector> -#include <o3tl/optional.hxx> +#include <optional> #include <com/sun/star/uno/Reference.hxx> #include <editeng/eeitem.hxx> @@ -491,7 +491,7 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry sal_uInt16 nTextRangeEnd; std::unique_ptr<SvxFieldItem> xField1; std::unique_ptr<SvxFieldItem> xField2; - o3tl::optional<OUString> xString; + std::optional<OUString> xString; PPTFieldEntry() : nPos(0) @@ -813,7 +813,7 @@ class PPTNumberFormatCreator sal_uInt32 nLevel, TSS_Type nInstance, TSS_Type nInstanceInSheet, - o3tl::optional< sal_Int16 >& rStartNumbering, + std::optional< sal_Int16 >& rStartNumbering, sal_uInt32 nFontHeight, PPTParagraphObj const * pPara ); @@ -841,7 +841,7 @@ public: SvxNumberFormat& rNumberFormat, PPTParagraphObj* pPara, TSS_Type nInstanceInSheet, - o3tl::optional< sal_Int16 >& rStartNumbering + std::optional< sal_Int16 >& rStartNumbering ); }; @@ -1177,7 +1177,7 @@ public: void AppendPortion( PPTPortionObj& rPortion ); void ApplyTo( SfxItemSet& rSet, - o3tl::optional< sal_Int16 >& rStartNumbering, + std::optional< sal_Int16 >& rStartNumbering, SdrPowerPointImport const & rManager, TSS_Type nInstanceInSheet ); |