diff options
Diffstat (limited to 'oox/inc/drawingml')
| -rw-r--r-- | oox/inc/drawingml/table/tablestylepart.hxx | 10 | ||||
| -rw-r--r-- | oox/inc/drawingml/textbodyproperties.hxx | 12 | ||||
| -rw-r--r-- | oox/inc/drawingml/textparagraphproperties.hxx | 14 |
3 files changed, 18 insertions, 18 deletions
diff --git a/oox/inc/drawingml/table/tablestylepart.hxx b/oox/inc/drawingml/table/tablestylepart.hxx index 056b79b393f1..f79591f35206 100644 --- a/oox/inc/drawingml/table/tablestylepart.hxx +++ b/oox/inc/drawingml/table/tablestylepart.hxx @@ -21,7 +21,7 @@ #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX #include <rtl/ustring.hxx> -#include <o3tl/optional.hxx> +#include <optional> #include <oox/drawingml/color.hxx> #include <drawingml/textfont.hxx> #include <oox/drawingml/shape.hxx> @@ -40,8 +40,8 @@ public: TableStylePart(); ::oox::drawingml::Color& getTextColor(){ return maTextColor; } - ::o3tl::optional< bool >& getTextBoldStyle(){ return maTextBoldStyle; } - ::o3tl::optional< bool >& getTextItalicStyle(){ return maTextItalicStyle; } + ::std::optional< bool >& getTextBoldStyle(){ return maTextBoldStyle; } + ::std::optional< bool >& getTextItalicStyle(){ return maTextItalicStyle; } ::oox::drawingml::TextFont& getAsianFont(){ return maAsianFont; } ::oox::drawingml::TextFont& getComplexFont(){ return maComplexFont; } ::oox::drawingml::TextFont& getSymbolFont(){ return maSymbolFont; } @@ -55,8 +55,8 @@ public: private: ::oox::drawingml::Color maTextColor; - ::o3tl::optional< bool > maTextBoldStyle; - ::o3tl::optional< bool > maTextItalicStyle; + ::std::optional< bool > maTextBoldStyle; + ::std::optional< bool > maTextItalicStyle; ::oox::drawingml::TextFont maAsianFont; ::oox::drawingml::TextFont maComplexFont; ::oox::drawingml::TextFont maSymbolFont; diff --git a/oox/inc/drawingml/textbodyproperties.hxx b/oox/inc/drawingml/textbodyproperties.hxx index 4c378cf094a0..eddf78a5f97f 100644 --- a/oox/inc/drawingml/textbodyproperties.hxx +++ b/oox/inc/drawingml/textbodyproperties.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <oox/helper/helper.hxx> #include <oox/helper/propertymap.hxx> -#include <o3tl/optional.hxx> +#include <optional> namespace oox { namespace drawingml { @@ -35,11 +35,11 @@ struct TextBodyProperties OptValue< sal_Int32 > moRotation; bool mbAnchorCtr; OptValue< sal_Int32 > moVert; - o3tl::optional< sal_Int32 > moInsets[4]; - o3tl::optional< sal_Int32 > moTextOffUpper; - o3tl::optional< sal_Int32 > moTextOffLeft; - o3tl::optional< sal_Int32 > moTextOffLower; - o3tl::optional< sal_Int32 > moTextOffRight; + std::optional< sal_Int32 > moInsets[4]; + std::optional< sal_Int32 > moTextOffUpper; + std::optional< sal_Int32 > moTextOffLeft; + std::optional< sal_Int32 > moTextOffLower; + std::optional< sal_Int32 > moTextOffRight; css::drawing::TextVerticalAdjust meVA; OUString msPrst; /// Number of requested columns. diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx index 6b9d93ccdf78..ccca29a0750d 100644 --- a/oox/inc/drawingml/textparagraphproperties.hxx +++ b/oox/inc/drawingml/textparagraphproperties.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/style/ParagraphAdjust.hpp> #include <drawingml/textfont.hxx> #include <drawingml/textspacing.hxx> -#include <o3tl/optional.hxx> +#include <optional> namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } @@ -90,10 +90,10 @@ public: TextSpacing& getParaTopMargin() { return maParaTopMargin; } TextSpacing& getParaBottomMargin() { return maParaBottomMargin; } - o3tl::optional< sal_Int32 >& getParaLeftMargin(){ return moParaLeftMargin; } - o3tl::optional< sal_Int32 >& getFirstLineIndentation(){ return moFirstLineIndentation; } + std::optional< sal_Int32 >& getParaLeftMargin(){ return moParaLeftMargin; } + std::optional< sal_Int32 >& getFirstLineIndentation(){ return moFirstLineIndentation; } - o3tl::optional< css::style::ParagraphAdjust >& getParaAdjust() { return moParaAdjust; } + std::optional< css::style::ParagraphAdjust >& getParaAdjust() { return moParaAdjust; } void setParaAdjust( css::style::ParagraphAdjust nParaAdjust ) { moParaAdjust = nParaAdjust; } TextSpacing& getLineSpacing() { return maLineSpacing; } @@ -124,9 +124,9 @@ protected: BulletList maBulletList; TextSpacing maParaTopMargin; TextSpacing maParaBottomMargin; - o3tl::optional< sal_Int32 > moParaLeftMargin; - o3tl::optional< sal_Int32 > moFirstLineIndentation; - o3tl::optional< css::style::ParagraphAdjust > moParaAdjust; + std::optional< sal_Int32 > moParaLeftMargin; + std::optional< sal_Int32 > moFirstLineIndentation; + std::optional< css::style::ParagraphAdjust > moParaAdjust; sal_Int16 mnLevel; TextSpacing maLineSpacing; }; |