diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-12-05 14:49:09 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-12-05 19:25:11 -0500 |
| commit | 4ea9d4daf7a2e79a0b78701f1a5f76b447d132ed (patch) | |
| tree | fd8a5c459d4ee5ef2f339aa4eae6ccf23bb04353 /sc/inc | |
| parent | 1e169828b1fdd50a09540cf4927b3c64639bbca7 (diff) | |
Use boost::scoped_ptr in lieu of std::auto_ptr (where we can).
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/chart2uno.hxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index a670f10d3d35..2f923494bd98 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -56,11 +56,13 @@ #include <rtl/ustring.hxx> #include <svl/itemprop.hxx> -#include <boost/unordered_set.hpp> #include <list> #include <vector> #include <memory> #include <boost/shared_ptr.hpp> +#include <boost/unordered_set.hpp> +#include <boost/noncopyable.hpp> +#include <boost/scoped_ptr.hpp> #define USE_CHART2_EMPTYDATASEQUENCE 0 @@ -246,9 +248,9 @@ class ScChart2DataSequence : public ::com::sun::star::util::XCloneable, ::com::sun::star::util::XModifyBroadcaster, ::com::sun::star::beans::XPropertySet, -// ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::lang::XServiceInfo>, - SfxListener + SfxListener, + boost::noncopyable { public: explicit ScChart2DataSequence( ScDocument* pDoc, @@ -448,11 +450,9 @@ private: sal_Bool m_bIncludeHiddenCells; // internals - SAL_WNODEPRECATED_DECLARATIONS_PUSH - typedef ::std::auto_ptr< ::std::vector<ScTokenRef> > TokenListPtr; - typedef ::std::auto_ptr< ::std::vector<sal_uInt32> > RangeIndexMapPtr; - typedef ::std::auto_ptr<ExternalRefListener> ExtRefListenerPtr; - SAL_WNODEPRECATED_DECLARATIONS_POP + typedef boost::scoped_ptr<std::vector<ScTokenRef> > TokenListPtr; + typedef boost::scoped_ptr<std::vector<sal_uInt32> > RangeIndexMapPtr; + typedef boost::scoped_ptr<ExternalRefListener> ExtRefListenerPtr; sal_Int64 m_nObjectId; ScDocument* m_pDocument; @@ -462,9 +462,8 @@ private: com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; SfxItemPropertySet m_aPropSet; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<HiddenRangeListener> m_pHiddenListener; - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr<HiddenRangeListener> m_pHiddenListener; + ScLinkListener* m_pValueListener; XModifyListenerArr_Impl m_aValueListeners; |