diff options
Diffstat (limited to 'lotuswordpro/source/filter')
-rw-r--r-- | lotuswordpro/source/filter/lwpoverride.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwppara1.cxx | 10 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpparaborderoverride.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpparastyle.cxx | 2 |
4 files changed, 18 insertions, 0 deletions
diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx index 21a00885e29a..30ea479cd798 100644 --- a/lotuswordpro/source/filter/lwpoverride.cxx +++ b/lotuswordpro/source/filter/lwpoverride.cxx @@ -386,10 +386,12 @@ LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride const& rOther) , m_pParaSpacingAbove(0) , m_pParaSpacingBelow(0) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<LwpSpacingCommonOverride> pSpacing(::clone(rOther.m_pSpacing)); std::auto_ptr<LwpSpacingCommonOverride> pAboveLineSpacing(::clone(rOther.m_pAboveLineSpacing)); std::auto_ptr<LwpSpacingCommonOverride> pParaSpacingAbove(::clone(rOther.m_pParaSpacingAbove)); std::auto_ptr<LwpSpacingCommonOverride> pParaSpacingBelow(::clone(rOther.m_pParaSpacingBelow)); + SAL_WNODEPRECATED_DECLARATIONS_POP m_pSpacing = pSpacing.release(); m_pAboveLineSpacing = pAboveLineSpacing.release(); m_pParaSpacingAbove = pParaSpacingAbove.release(); @@ -468,7 +470,9 @@ LwpAmikakeOverride::LwpAmikakeOverride(LwpAmikakeOverride const& rOther) , m_pBackgroundStuff(0) , m_nType(rOther.m_nType) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<LwpBackgroundStuff> pBackgroundStuff(::clone(rOther.m_pBackgroundStuff)); + SAL_WNODEPRECATED_DECLARATIONS_POP m_pBackgroundStuff = pBackgroundStuff.release(); } diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index 38ad11236591..6b99b6aabd52 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -355,11 +355,13 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl } LwpOverride* pBorder = pParaStyle->GetParaBorder(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<LwpParaBorderOverride> pFinalBorder( pBorder ? polymorphic_downcast<LwpParaBorderOverride*>(pBorder->clone()) : new LwpParaBorderOverride) ; + SAL_WNODEPRECATED_DECLARATIONS_POP // get local border pBorder = static_cast<LwpParaBorderProperty*>(pProps)->GetLocalParaBorder(); @@ -387,11 +389,13 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl } LwpOverride* pBreaks = pParaStyle->GetBreaks(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<LwpBreaksOverride> pFinalBreaks( pBreaks ? polymorphic_downcast<LwpBreaksOverride*>(pBreaks->clone()) : new LwpBreaksOverride) ; + SAL_WNODEPRECATED_DECLARATIONS_POP // get local breaks pBreaks = static_cast<LwpParaBreaksProperty*>(pProps)->GetLocalParaBreaks(); @@ -474,11 +478,13 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) m_bHasBullet = sal_True; LwpOverride* pBullet= pParaStyle->GetBulletOverride(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_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()); @@ -512,7 +518,9 @@ 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 delete m_pBullOver; m_pBullOver = pBulletOverride.release(); } @@ -532,7 +540,9 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps) } LwpNumberingOverride* pParaNumbering = pParaStyle->GetNumberingOverride(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<LwpNumberingOverride> pOver(new LwpNumberingOverride); + SAL_WNODEPRECATED_DECLARATIONS_POP //Override with the local numbering, if any if (pProps) { diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.cxx b/lotuswordpro/source/filter/lwpparaborderoverride.cxx index b299e091d82a..cae9854c0960 100644 --- a/lotuswordpro/source/filter/lwpparaborderoverride.cxx +++ b/lotuswordpro/source/filter/lwpparaborderoverride.cxx @@ -101,10 +101,12 @@ LwpParaBorderOverride::LwpParaBorderOverride(LwpParaBorderOverride const& rOther , m_nRightWidth(rOther.m_nRightWidth) , m_nBetweenMargin(rOther.m_nBetweenMargin) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<LwpBorderStuff> pBorderStuff(::clone(rOther.m_pBorderStuff)); std::auto_ptr<LwpBorderStuff> pBetweenStuff(::clone(rOther.m_pBetweenStuff)); std::auto_ptr<LwpShadow> pShadow(::clone(rOther.m_pShadow)); std::auto_ptr<LwpMargins> pMargins(::clone(rOther.m_pMargins)); + SAL_WNODEPRECATED_DECLARATIONS_POP m_pBorderStuff = pBorderStuff.release(); m_pBetweenStuff = pBetweenStuff.release(); m_pShadow = pShadow.release(); diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 9637e89c0bce..e00ac2c054ee 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -445,7 +445,9 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpInden else pParentPara = NULL; + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<LwpIndentOverride> pTotalIndent(new LwpIndentOverride); + SAL_WNODEPRECATED_DECLARATIONS_POP if (pIndent->IsUseRelative() && pParentPara) { LwpIndentOverride* pParentIndent = pParentPara->GetIndent(); |