From d030c4a2a54418b17e87f837092a33eae21f0588 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 17 Sep 2015 18:59:32 +0100
Subject: revert for mac and win unit case crashes after boost->std

Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
---
 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 e0884c757b6d..5514e0269016 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_SC_INC_COLORSCALE_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <formula/grammar.hxx>
 #include <tools/color.hxx>
 #include "rangelst.hxx"
@@ -19,7 +20,6 @@
 #include <svl/listener.hxx>
 #include <svl/broadcast.hxx>
 
-#include <memory>
 #include <vector>
 
 //TODO: merge this with conditio.hxx
@@ -50,8 +50,8 @@ class SC_DLLPUBLIC ScColorScaleEntry
 private:
     double mnVal;
     Color maColor;
-    std::unique_ptr<ScFormulaCell> mpCell;
-    std::unique_ptr<ScFormulaListener> mpListener;
+    boost::scoped_ptr<ScFormulaCell> mpCell;
+    boost::scoped_ptr<ScFormulaListener> mpListener;
     ScColorScaleEntryType meType;
 
 public:
@@ -133,7 +133,7 @@ struct SC_DLLPUBLIC ScDataBarFormatData
      *
      * Default color is 0xFF0000, this value is not set
      */
-    std::unique_ptr<Color> mpNegativeColor;
+    boost::scoped_ptr<Color> mpNegativeColor;
     /**
      * Color of the axis if used
      * Default color is black
@@ -177,8 +177,8 @@ struct SC_DLLPUBLIC ScDataBarFormatData
      */
     bool mbOnlyBar;
 
-    std::unique_ptr<ScColorScaleEntry> mpUpperLimit;
-    std::unique_ptr<ScColorScaleEntry> mpLowerLimit;
+    boost::scoped_ptr<ScColorScaleEntry> mpUpperLimit;
+    boost::scoped_ptr<ScColorScaleEntry> mpLowerLimit;
 };
 
 enum ScIconSetType
@@ -242,7 +242,7 @@ private:
     {
         std::vector<double> maValues;
     };
-    mutable std::unique_ptr<ScColorFormatCache> mpCache;
+    mutable boost::scoped_ptr<ScColorFormatCache> mpCache;
 };
 
 typedef std::vector<std::unique_ptr<ScColorScaleEntry>> ScColorScaleEntries;
@@ -323,7 +323,7 @@ private:
     double getMin(double nMin, double nMax) const;
     double getMax(double nMin, double nMax) const;
 
-    std::unique_ptr<ScDataBarFormatData> mpFormatData;
+    boost::scoped_ptr<ScDataBarFormatData> mpFormatData;
 };
 
 struct ScIconSetFormatData
@@ -396,7 +396,7 @@ private:
     double GetMaxValue() const;
     double CalcValue(double nMin, double nMax, ScIconSetFormat::const_iterator& itr) const;
 
-    std::unique_ptr<ScIconSetFormatData> mpFormatData;
+    boost::scoped_ptr<ScIconSetFormatData> mpFormatData;
 };
 
 #endif
-- 
cgit