diff options
Diffstat (limited to 'lotuswordpro/source/filter/lwpcharacterstyle.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpcharacterstyle.cxx | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx index 72ec1a982b63..a100423377bd 100644 --- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx +++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx @@ -74,10 +74,6 @@ LwpTextStyle::LwpTextStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm) : LwpDLNFPVList(objHdr, pStrm), m_nFontID(0), m_nFinalFontID(0), m_nCSFlags(0), m_nUseCount(0), - m_pDescription(new LwpAtomHolder), m_pLangOverride(new LwpTextLanguageOverride), - m_pTxtAttrOverride(new LwpTextAttributeOverride), - m_pCharacterBorderOverride(new LwpCharacterBorderOverride), - m_pAmikakeOverride(new LwpAmikakeOverride), m_nStyleDefinition(0), m_nKey(0) { } @@ -90,26 +86,6 @@ void LwpTextStyle::Read() LwpTextStyle::~LwpTextStyle() { - if (m_pDescription) - { - delete m_pDescription; - } - if (m_pLangOverride) - { - delete m_pLangOverride; - } - if (m_pTxtAttrOverride) - { - delete m_pTxtAttrOverride; - } - if (m_pCharacterBorderOverride) - { - delete m_pCharacterBorderOverride; - } - if (m_pAmikakeOverride) - { - delete m_pAmikakeOverride; - } } void LwpTextStyle::ReadCommon() @@ -119,14 +95,14 @@ void LwpTextStyle::ReadCommon() m_nCSFlags = m_pObjStrm->QuickReaduInt16(); m_nUseCount = m_pObjStrm->QuickReaduInt32(); - m_pDescription->Read(m_pObjStrm.get()); + m_aDescription.Read(m_pObjStrm.get()); - m_pLangOverride->Read(m_pObjStrm.get()); - m_pTxtAttrOverride->Read(m_pObjStrm.get()); + m_aLangOverride.Read(m_pObjStrm.get()); + m_aTxtAttrOverride.Read(m_pObjStrm.get()); if (LwpFileHeader::m_nFileRevision < 0x000B) { - m_pCharacterBorderOverride->Read(m_pObjStrm.get()); - m_pAmikakeOverride->Read(m_pObjStrm.get()); + m_aCharacterBorderOverride.Read(m_pObjStrm.get()); + m_aAmikakeOverride.Read(m_pObjStrm.get()); } else { |