diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
commit | d030c4a2a54418b17e87f837092a33eae21f0588 (patch) | |
tree | dd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sc/inc/conditio.hxx | |
parent | silence warning when not a warning (diff) | |
download | core-d030c4a2a54418b17e87f837092a33eae21f0588.tar.gz core-d030c4a2a54418b17e87f837092a33eae21f0588.zip |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sc/inc/conditio.hxx')
-rw-r--r-- | sc/inc/conditio.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 839c5b0080ae..5893585bb0da 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -32,10 +32,10 @@ #include <tools/date.hxx> #include <map> -#include <memory> #include <set> #include <boost/noncopyable.hpp> +#include <boost/scoped_ptr.hpp> class ScFormulaCell; class ScTokenArray; @@ -280,7 +280,7 @@ private: nValueItems(0) {} }; - mutable std::unique_ptr<ScConditionEntryCache> mpCache; + mutable boost::scoped_ptr<ScConditionEntryCache> mpCache; }; // single condition entry for conditional formatting @@ -370,7 +370,7 @@ public: private: condformat::ScCondFormatDateType meType; - mutable std::unique_ptr<Date> mpCache; + mutable boost::scoped_ptr<Date> mpCache; OUString maStyleName; }; |