diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-14 13:57:48 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-14 17:18:58 -0500 |
| commit | 7cec5493cebfb0833389ea79cb83fbc677c6751c (patch) | |
| tree | a13e3904a65ce74edebb7597238cf876c6705d2c /sc | |
| parent | 8f38e6a4cc492d2ac978ff11376f568f010b82cb (diff) | |
Remove std::auto_ptr in favor of boost::scoped_ptr.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/dpsave.hxx | 6 | ||||
| -rw-r--r-- | sc/source/core/data/dpsave.cxx | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 08b5c76707ce..89f34a2298c6 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -30,10 +30,10 @@ #define SC_DPSAVE_HXX #include <list> -#include <memory> #include <boost/ptr_container/ptr_vector.hpp> #include <boost/unordered_map.hpp> +#include <boost/scoped_ptr.hpp> #include <com/sun/star/sheet/XDimensionsSupplier.hpp> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> @@ -256,9 +256,7 @@ private: * created. */ bool mbDimensionMembersBuilt; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<rtl::OUString> mpGrandTotalName; - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr<rtl::OUString> mpGrandTotalName; public: SC_DLLPUBLIC ScDPSaveData(); diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 287c6b6859bb..2c2378358496 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -755,7 +755,7 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) : aDimList = r.aDimList.clone(); - if (r.mpGrandTotalName.get()) + if (r.mpGrandTotalName) mpGrandTotalName.reset(new OUString(*r.mpGrandTotalName)); } @@ -790,14 +790,14 @@ bool ScDPSaveData::operator== ( const ScDPSaveData& r ) const if (aDimList != r.aDimList) return false; - if (mpGrandTotalName.get()) + if (mpGrandTotalName) { - if (!r.mpGrandTotalName.get()) + if (!r.mpGrandTotalName) return false; if (!mpGrandTotalName->equals(*r.mpGrandTotalName)) return false; } - else if (r.mpGrandTotalName.get()) + else if (r.mpGrandTotalName) return false; return true; |