diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-17 16:32:04 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-22 14:02:02 -0500 |
| commit | 94d5262ed88d40d7f1793e0d82534ecdc541b944 (patch) | |
| tree | b2df0836de26ff2184e2340110565c0f5ed059a6 /sc | |
| parent | Scope reduction. (diff) | |
| download | core-94d5262ed88d40d7f1793e0d82534ecdc541b944.tar.gz core-94d5262ed88d40d7f1793e0d82534ecdc541b944.zip | |
auto_ptr to boost::scoped_ptr.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/dpsave.hxx | 10 | ||||
| -rw-r--r-- | sc/source/core/data/dpsave.cxx | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 89f34a2298c6..987f232d491b 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -61,9 +61,7 @@ class ScDPSaveMember { private: ::rtl::OUString aName; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table. - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table. sal_uInt16 nVisibleMode; sal_uInt16 nShowDetailsMode; @@ -107,10 +105,8 @@ class SC_DLLPUBLIC ScDPSaveDimension private: ::rtl::OUString aName; ::rtl::OUString* pSelectedPage; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<rtl::OUString> mpLayoutName; - ::std::auto_ptr<rtl::OUString> mpSubtotalName; - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr<rtl::OUString> mpLayoutName; + boost::scoped_ptr<rtl::OUString> mpSubtotalName; bool bIsDataLayout; bool bDupFlag; sal_uInt16 nOrientation; diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 9f0f31ca8cd3..27d6c686ca23 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -94,7 +94,7 @@ ScDPSaveMember::ScDPSaveMember(const ScDPSaveMember& r) : nVisibleMode( r.nVisibleMode ), nShowDetailsMode( r.nShowDetailsMode ) { - if (r.mpLayoutName.get()) + if (r.mpLayoutName) mpLayoutName.reset(new OUString(*r.mpLayoutName)); } @@ -171,7 +171,7 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb lcl_SetBoolProperty( xMembProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_SHOWDETAILS)), (bool)nShowDetailsMode ); - if (mpLayoutName.get()) + if (mpLayoutName) ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, SC_UNO_DP_LAYOUTNAME, *mpLayoutName); if ( nPosition >= 0 ) @@ -248,9 +248,9 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) : pSelectedPage = new ::rtl::OUString( *(r.pSelectedPage) ); else pSelectedPage = NULL; - if (r.mpLayoutName.get()) + if (r.mpLayoutName) mpLayoutName.reset(new OUString(*r.mpLayoutName)); - if (r.mpSubtotalName.get()) + if (r.mpSubtotalName) mpSubtotalName.reset(new OUString(*r.mpSubtotalName)); } @@ -584,7 +584,7 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD // else keep empty sequence ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_DP_FILTER, aFilter); - if (mpLayoutName.get()) + if (mpLayoutName) ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_DP_LAYOUTNAME, *mpLayoutName); const OUString* pSubTotalName = GetSubtotalName(); |