diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-02-26 12:47:05 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-02-26 14:06:24 +0100 |
commit | 6ce7808d586bcfb442160d58f4ce5b55d53067b2 (patch) | |
tree | ab4364387f68c445a8db4c477634cbbae365a7e5 /sw | |
parent | 7deb4c93a804b2f17d102f2f24448a5c638a96ea (diff) |
unique_ptr, constness, naming conventions
Change-Id: I37cbfbcc887ec82e750ba1bc614f4eda77be933b
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/frmedt/fetab.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 729de3077041..73d086204110 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -83,19 +83,18 @@ const SwFrm *pRowCacheLastCellFrm = 0; class TblWait { - SwWait *pWait; + ::std::unique_ptr<SwWait> m_pWait; public: TblWait(size_t nCnt, SwFrm *pFrm, SwDocShell &rDocShell, size_t nCnt2 = 0); - ~TblWait() { delete pWait; } }; TblWait::TblWait(size_t const nCnt, SwFrm *pFrm, SwDocShell &rDocShell, size_t const nCnt2): - pWait( 0 ) + m_pWait( nullptr ) { - bool bWait = 20 < nCnt || 20 < nCnt2 || (pFrm && + const bool bWait = 20 < nCnt || 20 < nCnt2 || (pFrm && 20 < pFrm->ImplFindTabFrm()->GetTable()->GetTabLines().size()); if( bWait ) - pWait = new SwWait( rDocShell, true ); + m_pWait = ::std::unique_ptr<SwWait>(new SwWait( rDocShell, true )); } void SwFEShell::ParkCursorInTab() |