diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 14:57:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 16:09:27 +0000 |
| commit | f3307b030635651a01941e76b2011f5c51ed1b84 (patch) | |
| tree | 99bf08f28b64d2a1cdd28b172f46d876f7b5791c /sw/inc | |
| parent | a9311d6b1a8528d009bc25a4f1c80c7d9db58e49 (diff) | |
coverity#1187644 confused copy ctors, leaks, etc.
also
coverity#1187861 Uninitialized pointer field
coverity#1187862 Uninitialized pointer field
Change-Id: Ibc420b8ef2d6db58b1b23a85a4029182a05b5f44
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/redline.hxx | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 9bd90c95ca76..09df1f9e2768 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -299,11 +299,9 @@ public: }; /// Base object for 'Redlines' that are not of 'Ranged' type (like table row insert\delete) -class SW_DLLPUBLIC SwExtraRedline +class SW_DLLPUBLIC SwExtraRedline : private boost::noncopyable { public: - SwExtraRedline( ); - SwExtraRedline( const SwExtraRedline& ); virtual ~SwExtraRedline(); }; @@ -311,48 +309,46 @@ public: class SW_DLLPUBLIC SwTableRowRedline : public SwExtraRedline { private: - SwRedlineData* pRedlineData; - const SwTableLine* pTableLine; + SwRedlineData m_aRedlineData; + const SwTableLine& m_rTableLine; public: - SwTableRowRedline( const SwRedlineData& rData, SwTableLine& aTableLine ); - SwTableRowRedline( const SwTableRowRedline& ); + SwTableRowRedline(const SwRedlineData& rData, const SwTableLine& rTableLine); virtual ~SwTableRowRedline(); /** ExtraData gets copied, the pointer is therefor not taken over by * the RedLineObject.*/ void SetExtraData( const SwRedlineExtraData* pData ) - { pRedlineData->SetExtraData( pData ); } + { m_aRedlineData.SetExtraData( pData ); } const SwRedlineExtraData* GetExtraData() const - { return pRedlineData->GetExtraData(); } - const SwTableLine* GetTableLine() const - { return pTableLine; } + { return m_aRedlineData.GetExtraData(); } + const SwTableLine& GetTableLine() const + { return m_rTableLine; } const SwRedlineData& GetRedlineData() const - { return *pRedlineData; } + { return m_aRedlineData; } }; /// Redline that holds information about a table-cell that had some change class SW_DLLPUBLIC SwTableCellRedline : public SwExtraRedline { private: - SwRedlineData* pRedlineData; - const SwTableBox* pTableBox; + SwRedlineData m_aRedlineData; + const SwTableBox& m_rTableBox; public: - SwTableCellRedline( const SwRedlineData& rData, SwTableBox& aTableBox ); - SwTableCellRedline( const SwTableCellRedline& ); + SwTableCellRedline(const SwRedlineData& rData, const SwTableBox& rTableBox); virtual ~SwTableCellRedline(); /** ExtraData gets copied, the pointer is therefor not taken over by * the RedLineObject.*/ void SetExtraData( const SwRedlineExtraData* pData ) - { pRedlineData->SetExtraData( pData ); } + { m_aRedlineData.SetExtraData( pData ); } const SwRedlineExtraData* GetExtraData() const - { return pRedlineData->GetExtraData(); } - const SwTableBox* GetTableBox() const - { return pTableBox; } + { return m_aRedlineData.GetExtraData(); } + const SwTableBox& GetTableBox() const + { return m_rTableBox; } const SwRedlineData& GetRedlineData() const - { return *pRedlineData; } + { return m_aRedlineData; } }; class SW_DLLPUBLIC SwRedlineHint : public SfxHint |