diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-16 12:17:44 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:20:46 +0100 |
commit | c72fac269626cd4c2c3f62a6eed69e47b59256a4 (patch) | |
tree | d36dd1a09731cb07254ae4a09036b2d64a59de44 /basctl | |
parent | de6b9148eb64dfa4b31c87c1ac46fda0821645e3 (diff) |
vclwidget: convert lots more sites to use VclPtr
seems there was a lot of shared_ptr usage floating around...
Change-Id: Icd05243170eb8493709275fc36bf986fc194b781
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/brkdlg.cxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/brkdlg.hxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/layout.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/layout.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/basidesh.hxx | 6 |
7 files changed, 9 insertions, 7 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index addef49f60a9..82e282501197 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -109,7 +109,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) SAL_OVERRIDE; CodeCompleteDataCache aCodeCompleteCache; - boost::scoped_ptr< CodeCompleteWindow > pCodeCompleteWnd; + VclPtr<CodeCompleteWindow> pCodeCompleteWnd; OUString GetActualSubName( sal_uLong nLine ); // gets the actual subroutine name according to line number void SetupAndShowCodeCompleteWnd(const std::vector< OUString >& aEntryVect, TextSelection aSel ); void HandleAutoCorrect(); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index d943ceccfcf4..66f5349a2ec6 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -271,6 +271,7 @@ void EditorWindow::dispose() EndListening( *pEditEngine ); pEditEngine->RemoveView(pEditView.get()); } + pCodeCompleteWnd.disposeAndClear(); vcl::Window::dispose(); } diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 366cc7b2d839..fa8399a00512 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -118,6 +118,7 @@ void BreakPointDialog::dispose() m_pNewButton.clear(); m_pDelButton.clear(); m_pNumericField.clear(); + m_pCheckBox.clear(); ModalDialog::dispose(); } diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index 5c78e7ce6674..50d18543d846 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -35,7 +35,7 @@ private: VclPtr<OKButton> m_pOKButton; VclPtr<PushButton> m_pNewButton; VclPtr<PushButton> m_pDelButton; - ::VclPtr<CheckBox> m_pCheckBox; + VclPtr<CheckBox> m_pCheckBox; VclPtr<NumericField> m_pNumericField; BreakPointList & m_rOriginalBreakPointList; diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index c475ab41e468..0c7a40dda941 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -195,7 +195,7 @@ void Layout::SplittedSide::Add (DockingWindow* pWin, Size const& rSize) // splitter if (!vItems.empty()) { - aItem.pSplit = boost::make_shared<Splitter>(&rLayout, bVertical ? WB_VSCROLL : WB_HSCROLL); + aItem.pSplit = new Splitter(&rLayout, bVertical ? WB_VSCROLL : WB_HSCROLL); aItem.pSplit->SetSplitPosPixel(aItem.nStartPos - nSplitThickness); InitSplitter(*aItem.pSplit); } diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx index ad19ad93e5f1..e25cb11461ea 100644 --- a/basctl/source/basicide/layout.hxx +++ b/basctl/source/basicide/layout.hxx @@ -113,7 +113,7 @@ private: long nStartPos, nEndPos; // splitter line window before the window // (the first one is always nullptr) - boost::shared_ptr<Splitter> pSplit; + VclPtr<Splitter> pSplit; }; std::vector<Item> vItems; private: diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 0baeb579dda1..2f154e9e25f5 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -74,12 +74,12 @@ private: VclPtr<ScrollBar> aHScrollBar; VclPtr<ScrollBar> aVScrollBar; VclPtr<ScrollBarBox> aScrollBarBox; - boost::scoped_ptr<TabBar> pTabBar; // basctl::TabBar + VclPtr<TabBar> pTabBar; // basctl::TabBar bool bTabBarSplitted; bool bCreatingWindow; // layout windows - boost::scoped_ptr<ModulWindowLayout> pModulLayout; - boost::scoped_ptr<DialogWindowLayout> pDialogLayout; + VclPtr<ModulWindowLayout> pModulLayout; + VclPtr<DialogWindowLayout> pDialogLayout; // the active layout window VclPtr<Layout> pLayout; // common object catalog window |