commit 6491d6f9f23573a5ffe2ebd89c0875256851ec7a
author Noel Grandin <noel.grandin@collabora.co.uk> Mon Apr 10 10:28:42 2017 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Tue Apr 11 08:10:03 2017 +0200
tree 6a9b3e56ccbe93ef0cd2f6b7ff7a5f0404b3781e
parent ade95165ef32443ebf419faaf0cef149497bb098

loplugin:inlinefields in LwpTextStyle

Change-Id: I5f5eef91ddfb108a77bfe57e0078f3fc7eb7c446
Reviewed-on: https://gerrit.libreoffice.org/36375
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

lotuswordpro/source/filter/lwpcharacterstyle.cxx

diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index 72ec1a9..a100423 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
    {

lotuswordpro/source/filter/lwpcharacterstyle.hxx

diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.hxx b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
index 9c9a610..4494088 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.hxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
@@ -63,6 +63,8 @@

#include "lwpobj.hxx"
#include "lwpdlvlist.hxx"
#include "lwpoverride.hxx"
#include "lwpcharborderoverride.hxx"

class LwpAtomHolder;
class LwpTextLanguageOverride;
@@ -92,12 +94,12 @@ protected:
    sal_uInt16      m_nCSFlags;
    sal_uInt32      m_nUseCount;

    LwpAtomHolder*                  m_pDescription;
    LwpTextLanguageOverride*        m_pLangOverride;
    LwpTextAttributeOverride*       m_pTxtAttrOverride;
    LwpAtomHolder                   m_aDescription;
    LwpTextLanguageOverride         m_aLangOverride;
    LwpTextAttributeOverride        m_aTxtAttrOverride;

    LwpCharacterBorderOverride*     m_pCharacterBorderOverride;
    LwpAmikakeOverride*             m_pAmikakeOverride;
    LwpCharacterBorderOverride      m_aCharacterBorderOverride;
    LwpAmikakeOverride              m_aAmikakeOverride;

    LwpObjectID     m_CharacterBorder;
    LwpObjectID     m_Amikake;