diff options
Diffstat (limited to 'oox/inc')
| -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 | ||||
| -rw-r--r-- | oox/inc/pch/precompiled_oox.hxx | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/oox/inc/drawingml/table/tablestylepart.hxx b/oox/inc/drawingml/table/tablestylepart.hxx index 2a03339962ca..056b79b393f1 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 <boost/optional.hpp> +#include <o3tl/optional.hxx> #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; } - ::boost::optional< bool >& getTextBoldStyle(){ return maTextBoldStyle; } - ::boost::optional< bool >& getTextItalicStyle(){ return maTextItalicStyle; } + ::o3tl::optional< bool >& getTextBoldStyle(){ return maTextBoldStyle; } + ::o3tl::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; - ::boost::optional< bool > maTextBoldStyle; - ::boost::optional< bool > maTextItalicStyle; + ::o3tl::optional< bool > maTextBoldStyle; + ::o3tl::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 785f117568a9..4c378cf094a0 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 <boost/optional.hpp> +#include <o3tl/optional.hxx> namespace oox { namespace drawingml { @@ -35,11 +35,11 @@ struct TextBodyProperties OptValue< sal_Int32 > moRotation; bool mbAnchorCtr; OptValue< sal_Int32 > moVert; - boost::optional< sal_Int32 > moInsets[4]; - boost::optional< sal_Int32 > moTextOffUpper; - boost::optional< sal_Int32 > moTextOffLeft; - boost::optional< sal_Int32 > moTextOffLower; - boost::optional< sal_Int32 > moTextOffRight; + 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; 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 5b8093bab391..6b9d93ccdf78 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 <boost/optional.hpp> +#include <o3tl/optional.hxx> namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } @@ -90,10 +90,10 @@ public: TextSpacing& getParaTopMargin() { return maParaTopMargin; } TextSpacing& getParaBottomMargin() { return maParaBottomMargin; } - boost::optional< sal_Int32 >& getParaLeftMargin(){ return moParaLeftMargin; } - boost::optional< sal_Int32 >& getFirstLineIndentation(){ return moFirstLineIndentation; } + o3tl::optional< sal_Int32 >& getParaLeftMargin(){ return moParaLeftMargin; } + o3tl::optional< sal_Int32 >& getFirstLineIndentation(){ return moFirstLineIndentation; } - boost::optional< css::style::ParagraphAdjust >& getParaAdjust() { return moParaAdjust; } + o3tl::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; - boost::optional< sal_Int32 > moParaLeftMargin; - boost::optional< sal_Int32 > moFirstLineIndentation; - boost::optional< css::style::ParagraphAdjust > moParaAdjust; + o3tl::optional< sal_Int32 > moParaLeftMargin; + o3tl::optional< sal_Int32 > moFirstLineIndentation; + o3tl::optional< css::style::ParagraphAdjust > moParaAdjust; sal_Int16 mnLevel; TextSpacing maLineSpacing; }; diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 17c38625bf2d..e261a0a46118 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -40,7 +40,7 @@ #include <utility> #include <vector> #include <boost/algorithm/string.hpp> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> |