diff options
| author | David Tardon <dtardon@redhat.com> | 2010-12-24 10:03:59 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2010-12-24 14:17:54 +0100 |
| commit | eb13a88164d7ca860af6dc48c9646232d7f908f1 (patch) | |
| tree | 2bf63ae3fcde6e3e750acf4ec59778e90b268cfe /lotuswordpro/source/filter/lwpbulletstylemgr.hxx | |
| parent | remove unused code (diff) | |
| download | core-eb13a88164d7ca860af6dc48c9646232d7f908f1.tar.gz core-eb13a88164d7ca860af6dc48c9646232d7f908f1.zip | |
replace virtual operator= by cloning
Diffstat (limited to 'lotuswordpro/source/filter/lwpbulletstylemgr.hxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx index 0da3b010cd61..b9268724d7f9 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx @@ -64,6 +64,9 @@ #ifndef _LWPBULLETSTYLEMGR_HXX #define _LWPBULLETSTYLEMGR_HXX +#include <boost/scoped_ptr.hpp> +#include <boost/shared_ptr.hpp> + #include "lwpheader.hxx" #include "lwpfoundry.hxx" #include "lwpobjid.hxx" @@ -112,7 +115,7 @@ private: private: // std::vector <XFListStyle*> m_aBulletStyleList; - typedef std::pair<LwpBulletOverride, LwpObjectID> OverridePair; + typedef std::pair<boost::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair; std::vector <rtl::OUString> m_vStyleNameList; std::vector <OverridePair> m_vIDsPairList; rtl::OUString m_aCurrentStyleName; @@ -124,7 +127,7 @@ private: sal_Bool m_bContinue; sal_Bool m_bIsBulletSkipped; LwpObjectID m_aCurrentNumberingID; - LwpNumberingOverride m_aCurrentNumOverride; + boost::scoped_ptr<LwpNumberingOverride> m_pCurrentNumOverride; sal_uInt16 m_nCurrentPos; }; @@ -159,11 +162,11 @@ inline sal_uInt16 LwpBulletStyleMgr::GetCurrentPos() const inline void LwpBulletStyleMgr::SetCurrentNumOver(const LwpNumberingOverride& rOther) { - m_aCurrentNumOverride = rOther; + m_pCurrentNumOverride.reset(rOther.clone()); } inline LwpNumberingOverride* LwpBulletStyleMgr::GetCurrentNumOver() { - return &m_aCurrentNumOverride; + return m_pCurrentNumOverride.get(); } #endif |