diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-02-01 01:00:03 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 07:40:30 +0000 |
| commit | 27832947f0d9406c1757182ffa57262f3f03af4b (patch) | |
| tree | b8a1403496524d797629072bcc08e9e589926f04 /sd/source | |
| parent | 0d17c4fa4994debb1a0d653ad9fb816c46623a57 (diff) | |
defaults are good enough ..
for copy ctor/assignment and dtor.
inline MEMBER_CONSTRUCTOR_LIST macro
Change-Id: I50296cebca3bc1aa43376ccd538c84df68a232a2
Reviewed-on: https://gerrit.libreoffice.org/33771
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/filter/ppt/ppt97animations.cxx | 37 | ||||
| -rw-r--r-- | sd/source/filter/ppt/ppt97animations.hxx | 3 |
2 files changed, 4 insertions, 36 deletions
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index d06f8bff7d2e..68069398399a 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -51,44 +51,15 @@ void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn ) rIn.ReadUChar( nUnknown2 ); } -#define MEMBER_CONSTRUCTOR_LIST() \ - m_aAtom() \ - , m_aSoundFileUrl() \ - , m_bDirtyCache(true) \ - , m_aPresetId() \ - , m_aSubType() \ - , m_bHasSpecialDuration(false) \ - , m_fDurationInSeconds(0.001) - Ppt97Animation::Ppt97Animation( SvStream& rInputStream ) - : MEMBER_CONSTRUCTOR_LIST() + : m_aAtom() + , m_bDirtyCache(true) + , m_bHasSpecialDuration(false) + , m_fDurationInSeconds(0.001) { m_aAtom.ReadStream( rInputStream ); } -Ppt97Animation::Ppt97Animation( const Ppt97Animation& rAnimation ) - : MEMBER_CONSTRUCTOR_LIST() -{ - *this = rAnimation; -} - -Ppt97Animation& Ppt97Animation::operator= ( const Ppt97Animation& rAnimation ) -{ - m_aAtom = rAnimation.m_aAtom; - m_aSoundFileUrl = rAnimation.m_aSoundFileUrl; - m_bDirtyCache = rAnimation.m_bDirtyCache; - m_aPresetId = rAnimation.m_aPresetId; - m_aSubType = rAnimation.m_aSubType; - m_bHasSpecialDuration = rAnimation.m_bHasSpecialDuration; - m_fDurationInSeconds = rAnimation.m_fDurationInSeconds; - - return *this; -} - -Ppt97Animation::~Ppt97Animation() -{ -} - bool Ppt97Animation::operator < ( const Ppt97Animation& rAnimation ) const { return m_aAtom.nOrderID < rAnimation.m_aAtom.nOrderID; diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index eb2079ec8c29..daa61ed6bbb0 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -88,11 +88,8 @@ class Ppt97Animation public: //public methods explicit Ppt97Animation( SvStream& rIn ); - Ppt97Animation( const Ppt97Animation& rAnimation ); - Ppt97Animation& operator= ( const Ppt97Animation& rAnimation ); bool operator < ( const Ppt97Animation& rAnimation ) const;//later is greater bool operator > ( const Ppt97Animation& rAnimation ) const;//later is greater - ~Ppt97Animation(); //get methods bool HasEffect() const; |