diff options
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/controller/inc/CharacterPropertyItemConverter.hxx | 4 | ||||
| -rw-r--r-- | chart2/source/view/axes/VAxisProperties.hxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 657e3d1824e4..d89b10d9b197 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -22,7 +22,7 @@ #include "ItemConverter.hxx" #include <com/sun/star/awt/Size.hpp> -#include <o3tl/optional.hxx> +#include <optional> namespace chart { namespace wrapper { @@ -52,7 +52,7 @@ private: OUString m_aRefSizePropertyName; css::uno::Reference<css::beans::XPropertySet> m_xRefSizePropSet; - o3tl::optional<css::awt::Size> m_pRefSize; + std::optional<css::awt::Size> m_pRefSize; }; }} diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index c9bd687909df..93c703378f29 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/uno/Any.hxx> #include <vector> -#include <o3tl/optional.hxx> +#include <optional> namespace chart { class ExplicitCategoriesProvider; } namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } @@ -101,8 +101,8 @@ struct AxisProperties final css::chart::ChartAxisLabelPosition m_eLabelPos; css::chart::ChartAxisMarkPosition m_eTickmarkPos; - o3tl::optional<double> m_pfMainLinePositionAtOtherAxis; - o3tl::optional<double> m_pfExrtaLinePositionAtOtherAxis; + std::optional<double> m_pfMainLinePositionAtOtherAxis; + std::optional<double> m_pfExrtaLinePositionAtOtherAxis; bool m_bCrossingAxisHasReverseDirection; bool m_bCrossingAxisIsCategoryAxes; |