diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 16:50:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 17:44:34 +0100 |
| commit | 47dd2c63f649828a833543e21d4eca5866ec9ebe (patch) | |
| tree | 0b9a64485028cb9c7c0ffc52cad79033b2cb6209 /chart2 | |
| parent | 6ddefb080b12f54f84a8de44347a9b1816972ad3 (diff) | |
Rewrite uses of boost::optional
...to only use functions that are also available for std::optional (in
preparation for changing from boost::optional to std::optional):
* uses of get are replaced with operator * or operator ->
* uses of is_initialized are replaced with operator bool
* uses of reset with an argument are replace with operator =
(All of the replacements are also available for boost::optional "since forever",
so this change should not break builds against old --with-system-boost. An
alternative replacement for is_initialized would have been has_value, but that
is only available since Boost 1.68.)
Change-Id: I532687b6a5ee37dab28befb8e0eb05c22cbecf0f
Reviewed-on: https://gerrit.libreoffice.org/84124
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2')
4 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 4e100bfb9822..f6f8961d21d6 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -81,7 +81,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter( m_xRefSizePropSet( rRefSizePropSet.is() ? rRefSizePropSet : rPropertySet ) { if (pRefSize) - m_pRefSize.reset(*pRefSize); + m_pRefSize = *pRefSize; } CharacterPropertyItemConverter::~CharacterPropertyItemConverter() diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 861ed4f63b33..16d951bdb5ad 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -118,7 +118,7 @@ sal_Int32 VAxisBase::estimateMaximumAutoMainIncrementCount() void VAxisBase::setExtraLinePositionAtOtherAxis( double fCrossingAt ) { - m_aAxisProperties.m_pfExrtaLinePositionAtOtherAxis.reset(fCrossingAt); + m_aAxisProperties.m_pfExrtaLinePositionAtOtherAxis = fCrossingAt; } sal_Int32 VAxisBase::getDimensionCount() const diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index d660915b4023..d35bc04a0d24 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -218,10 +218,10 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty if( m_bCrossingAxisIsCategoryAxes ) fValue = ::rtl::math::round(fValue); - m_pfMainLinePositionAtOtherAxis.reset(fValue); + m_pfMainLinePositionAtOtherAxis = fValue; } else if( m_eCrossoverType == css::chart::ChartAxisPosition_ZERO ) - m_pfMainLinePositionAtOtherAxis.reset(0.0); + m_pfMainLinePositionAtOtherAxis = 0.0; xAxisProp->getPropertyValue("LabelPosition") >>= m_eLabelPos; xAxisProp->getPropertyValue("MarkPosition") >>= m_eTickmarkPos; diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 59e05354b78e..6bf0b0f47d3b 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -147,7 +147,7 @@ void VPolarRadiusAxis::createShapes() } //xxxxx pTickInfo->updateUnscaledValue( xInverseScaling ); - aAxisProperties.m_pfMainLinePositionAtOtherAxis.reset(pTickInfo->getUnscaledTickValue()); + aAxisProperties.m_pfMainLinePositionAtOtherAxis = pTickInfo->getUnscaledTickValue(); aAxisProperties.m_bDisplayLabels=false; VCartesianAxis aAxis(aAxisProperties,m_xNumberFormatsSupplier |