diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2016-05-18 20:38:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-20 11:45:12 +0000 |
| commit | f88cf9129d5b81cf9dd380f63be87ba196121e42 (patch) | |
| tree | a7688ec48b4813d3a8198e336a43d379e742ce5f /svx/source/dialog | |
| parent | 7cffe9dd6440e0eb6a17c950b207f5fb669e8636 (diff) | |
tdf#89329: use unique_ptr for pImpl in svx/
Change-Id: I6c252272feb9915b580b3525a606c26c19cbe773
Reviewed-on: https://gerrit.libreoffice.org/25114
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/rubydialog.cxx | 3 | ||||
| -rwxr-xr-x | svx/source/dialog/srchdlg.cxx | 5 | ||||
| -rw-r--r-- | svx/source/dialog/swframeposstrings.cxx | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 85f31a4add60..90b7e623138e 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -207,8 +207,9 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind, SfxChildWindow* pCW, vcl::Windo , nCurrentEdit(0) , bModified(false) , pBindings(pBind) + , pImpl( new SvxRubyData_Impl ) { - xImpl = pImpl = new SvxRubyData_Impl; + xImpl = pImpl.get(); get(m_pLeftFT, "basetextft"); get(m_pRightFT, "rubytextft"); get(m_pAdjustLB, "adjustlb"); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 426d8e79e502..de310ce10d08 100755 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -257,7 +257,6 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi , bSet(false) , bConstruct(true) , nModifyFlag(0) - , pImpl(nullptr) , pSearchList(nullptr) , pReplaceList(new SearchAttrItemList) , pSearchItem(nullptr) @@ -360,7 +359,7 @@ void SvxSearchDialog::dispose() rBindings.LeaveRegistrations(); delete pSearchItem; - delete pImpl; + pImpl.reset(); delete pSearchList; delete pReplaceList; mpDocWin.clear(); @@ -414,7 +413,7 @@ void SvxSearchDialog::dispose() void SvxSearchDialog::Construct_Impl() { // temporary to avoid incompatibility - pImpl = new SearchDlg_Impl(); + pImpl.reset( new SearchDlg_Impl() ); pImpl->aSelectionTimer.SetTimeout( 500 ); pImpl->aSelectionTimer.SetTimeoutHdl( LINK( this, SvxSearchDialog, TimeoutHdl_Impl ) ); diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index 3729bb6f5c14..a055b7789021 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -48,7 +48,6 @@ SvxSwFramePosString::SvxSwFramePosString() : SvxSwFramePosString::~SvxSwFramePosString() { - delete pImpl; } const OUString& SvxSwFramePosString::GetString(StringId eId) |