From c8204ba5b86d080aa5ac3ec71dc6aaea1384b9a0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 18 Sep 2015 09:08:35 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7f3bb094f116103c1146a7d60e3af94c0b37d9ea Reviewed-on: https://gerrit.libreoffice.org/18677 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sc/inc/colorscale.hxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sc/inc/colorscale.hxx') diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 5514e0269016..e0884c757b6d 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -11,7 +11,6 @@ #define INCLUDED_SC_INC_COLORSCALE_HXX #include -#include #include #include #include "rangelst.hxx" @@ -20,6 +19,7 @@ #include #include +#include #include //TODO: merge this with conditio.hxx @@ -50,8 +50,8 @@ class SC_DLLPUBLIC ScColorScaleEntry private: double mnVal; Color maColor; - boost::scoped_ptr mpCell; - boost::scoped_ptr mpListener; + std::unique_ptr mpCell; + std::unique_ptr mpListener; ScColorScaleEntryType meType; public: @@ -133,7 +133,7 @@ struct SC_DLLPUBLIC ScDataBarFormatData * * Default color is 0xFF0000, this value is not set */ - boost::scoped_ptr mpNegativeColor; + std::unique_ptr mpNegativeColor; /** * Color of the axis if used * Default color is black @@ -177,8 +177,8 @@ struct SC_DLLPUBLIC ScDataBarFormatData */ bool mbOnlyBar; - boost::scoped_ptr mpUpperLimit; - boost::scoped_ptr mpLowerLimit; + std::unique_ptr mpUpperLimit; + std::unique_ptr mpLowerLimit; }; enum ScIconSetType @@ -242,7 +242,7 @@ private: { std::vector maValues; }; - mutable boost::scoped_ptr mpCache; + mutable std::unique_ptr mpCache; }; typedef std::vector> ScColorScaleEntries; @@ -323,7 +323,7 @@ private: double getMin(double nMin, double nMax) const; double getMax(double nMin, double nMax) const; - boost::scoped_ptr mpFormatData; + std::unique_ptr mpFormatData; }; struct ScIconSetFormatData @@ -396,7 +396,7 @@ private: double GetMaxValue() const; double CalcValue(double nMin, double nMax, ScIconSetFormat::const_iterator& itr) const; - boost::scoped_ptr mpFormatData; + std::unique_ptr mpFormatData; }; #endif -- cgit