diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-21 13:37:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-21 19:34:16 +0000 |
| commit | 599fab44ad2ca626f046b9e9e4924110950a897c (patch) | |
| tree | 4304f1e7f0ab68f88b105f5779b8ec619e176c12 /svtools/source/control/tabbar.cxx | |
| parent | da4c217ac49ff05e352c0e6e46a46a4e9a0b78cc (diff) | |
hide ScopedPtr::reset and add disposeAndClear
Change-Id: I55d6e789abd408b8478a2b9ae141d8899af2c309
Reviewed-on: https://gerrit.libreoffice.org/18745
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/source/control/tabbar.cxx')
| -rw-r--r-- | svtools/source/control/tabbar.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 04a048915ec4..1a9cceeb732e 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -809,7 +809,7 @@ void TabBar::ImplInitControls() { if (!mpImpl->mpSizer) { - mpImpl->mpSizer.reset(VclPtr<ImplTabSizer>::Create( this, mnWinStyle & (WB_DRAG | WB_3DLOOK))); + mpImpl->mpSizer.disposeAndReset(VclPtr<ImplTabSizer>::Create( this, mnWinStyle & (WB_DRAG | WB_3DLOOK))); } mpImpl->mpSizer->Show(); } @@ -821,7 +821,7 @@ void TabBar::ImplInitControls() if ((mnWinStyle & WB_INSERTTAB) && !mpImpl->mpAddButton) { Link<Button*,void> aLink = LINK(this, TabBar, ImplAddClickHandler); - mpImpl->mpAddButton.reset(VclPtr<ImplTabButton>::Create(this, WB_REPEAT)); + mpImpl->mpAddButton.disposeAndReset(VclPtr<ImplTabButton>::Create(this, WB_REPEAT)); mpImpl->mpAddButton->SetClickHdl(aLink); mpImpl->mpAddButton->SetSymbol(SymbolType::PLUS); mpImpl->mpAddButton->Show(); @@ -833,7 +833,7 @@ void TabBar::ImplInitControls() { if (!mpImpl->mpPrevButton) { - mpImpl->mpPrevButton.reset(VclPtr<ImplTabButton>::Create(this, WB_REPEAT)); + mpImpl->mpPrevButton.disposeAndReset(VclPtr<ImplTabButton>::Create(this, WB_REPEAT)); mpImpl->mpPrevButton->SetClickHdl(aLink); } mpImpl->mpPrevButton->SetSymbol(mbMirrored ? SymbolType::NEXT : SymbolType::PREV); @@ -841,7 +841,7 @@ void TabBar::ImplInitControls() if (!mpImpl->mpNextButton) { - mpImpl->mpNextButton.reset(VclPtr<ImplTabButton>::Create(this, WB_REPEAT)); + mpImpl->mpNextButton.disposeAndReset(VclPtr<ImplTabButton>::Create(this, WB_REPEAT)); mpImpl->mpNextButton->SetClickHdl(aLink); } mpImpl->mpNextButton->SetSymbol(mbMirrored ? SymbolType::PREV : SymbolType::NEXT); @@ -857,7 +857,7 @@ void TabBar::ImplInitControls() { if (!mpImpl->mpFirstButton) { - mpImpl->mpFirstButton.reset(VclPtr<ImplTabButton>::Create(this)); + mpImpl->mpFirstButton.disposeAndReset(VclPtr<ImplTabButton>::Create(this)); mpImpl->mpFirstButton->SetClickHdl(aLink); } mpImpl->mpFirstButton->SetSymbol(mbMirrored ? SymbolType::LAST : SymbolType::FIRST); @@ -865,7 +865,7 @@ void TabBar::ImplInitControls() if (!mpImpl->mpLastButton) { - mpImpl->mpLastButton.reset(VclPtr<ImplTabButton>::Create(this)); + mpImpl->mpLastButton.disposeAndReset(VclPtr<ImplTabButton>::Create(this)); mpImpl->mpLastButton->SetClickHdl(aLink); } mpImpl->mpLastButton->SetSymbol(mbMirrored ? SymbolType::FIRST : SymbolType::LAST); @@ -2130,7 +2130,7 @@ bool TabBar::StartEditMode(sal_uInt16 nPageId) ImplFormat(); Update(); - mpImpl->mpEdit.reset(VclPtr<TabBarEdit>::Create(this, WB_CENTER)); + mpImpl->mpEdit.disposeAndReset(VclPtr<TabBarEdit>::Create(this, WB_CENTER)); Rectangle aRect = GetPageRect( mnEditId ); long nX = aRect.Left(); long nWidth = aRect.GetWidth(); |