diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 12:27:58 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 12:28:53 +0200 |
| commit | 5e557a5f987b70f064e3381bda45bd882d651546 (patch) | |
| tree | cfe628f32ba9442c0a9235077b4daed25152eb61 /lotuswordpro/source/filter/lwppara1.cxx | |
| parent | linguistic: std::auto_ptr -> std::unique_ptr (diff) | |
| download | core-5e557a5f987b70f064e3381bda45bd882d651546.tar.gz core-5e557a5f987b70f064e3381bda45bd882d651546.zip | |
lotuswordpro: std::auto_ptr -> std::unique_ptr
Change-Id: I205b84f6dcb996935bd59ac9927313c6a88066b4
Diffstat (limited to 'lotuswordpro/source/filter/lwppara1.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwppara1.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index b508c6cc01e9..834174f8a816 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -388,13 +388,11 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl } LwpOverride* pBreaks = pParaStyle->GetBreaks(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr<LwpBreaksOverride> pFinalBreaks( + std::unique_ptr<LwpBreaksOverride> pFinalBreaks( pBreaks ? polymorphic_downcast<LwpBreaksOverride*>(pBreaks->clone()) : new LwpBreaksOverride) ; - SAL_WNODEPRECATED_DECLARATIONS_POP // get local breaks pBreaks = static_cast<LwpParaBreaksProperty*>(pProps)->GetLocalParaBreaks(); @@ -475,13 +473,11 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) m_bHasBullet = true; LwpOverride* pBullet= pParaStyle->GetBulletOverride(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr<LwpBulletOverride> pFinalBullet( + std::unique_ptr<LwpBulletOverride> pFinalBullet( pBullet ? polymorphic_downcast<LwpBulletOverride*>(pBullet->clone()) : new LwpBulletOverride) ; - SAL_WNODEPRECATED_DECLARATIONS_POP boost::scoped_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone()); pLocalBullet2->Override(pFinalBullet.get()); @@ -515,9 +511,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) m_pSilverBullet->SetFoundry(m_pFoundry); } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr<LwpBulletOverride> pBulletOverride(pBullOver->clone()); - SAL_WNODEPRECATED_DECLARATIONS_POP + std::unique_ptr<LwpBulletOverride> pBulletOverride(pBullOver->clone()); delete m_pBullOver; m_pBullOver = pBulletOverride.release(); } @@ -537,9 +531,7 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps) } LwpNumberingOverride* pParaNumbering = pParaStyle->GetNumberingOverride(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr<LwpNumberingOverride> pOver(new LwpNumberingOverride); - SAL_WNODEPRECATED_DECLARATIONS_POP + std::unique_ptr<LwpNumberingOverride> pOver(new LwpNumberingOverride); //Override with the local numbering, if any if (pProps) { |