diff options
| author | David Tardon <dtardon@redhat.com> | 2010-12-24 12:33:33 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2010-12-24 14:17:54 +0100 |
| commit | 9192e5de7dd52f3864d4870569458b2d9226f2a0 (patch) | |
| tree | c2b2a25971a5bc09e233b0c8a69045bb6b4ea510 /lotuswordpro/source/filter/lwpcharborderoverride.cxx | |
| parent | eb13a88164d7ca860af6dc48c9646232d7f908f1 (diff) | |
make copying aware of NULL pointers
Diffstat (limited to 'lotuswordpro/source/filter/lwpcharborderoverride.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpcharborderoverride.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.cxx b/lotuswordpro/source/filter/lwpcharborderoverride.cxx index 927d1dd78b03..b654afdf6f58 100644 --- a/lotuswordpro/source/filter/lwpcharborderoverride.cxx +++ b/lotuswordpro/source/filter/lwpcharborderoverride.cxx @@ -64,6 +64,7 @@ #include <memory> +#include "clone.hxx" #include "lwpcharborderoverride.hxx" #include "lwpborderstuff.hxx" #include "lwpmargins.hxx" @@ -80,8 +81,8 @@ LwpCharacterBorderOverride::LwpCharacterBorderOverride(LwpCharacterBorderOverrid , m_nAboveWidth(rOther.m_nAboveWidth) , m_nBelowWidth(rOther.m_nBelowWidth) { - std::auto_ptr<LwpBorderStuff> pBorderStuff(new LwpBorderStuff(*rOther.m_pBorderStuff)); - std::auto_ptr<LwpMargins> pMargins(new LwpMargins(*rOther.m_pMargins)); + std::auto_ptr<LwpBorderStuff> pBorderStuff(::clone(rOther.m_pBorderStuff)); + std::auto_ptr<LwpMargins> pMargins(::clone(rOther.m_pMargins)); m_pBorderStuff = pBorderStuff.release(); m_pMargins = pMargins.release(); } |