Kaydet (Commit) 7cec5493 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Remove std::auto_ptr in favor of boost::scoped_ptr.

üst 8f38e6a4
......@@ -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();
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment