diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-16 21:05:18 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-16 21:31:18 +0100 |
commit | d24f93dcf004dc81d4d5e9acec0b4e663fa09cd8 (patch) | |
tree | fb9dfae53e6b56dedf4e56b0b5fa45f5691ef565 /svx/source/tbxctrls/fillctrl.cxx | |
parent | 384e705a9e1e41dd859d22a09293c65a28ef6535 (diff) |
make CreateItemWindow return a VclPtr<>.
Change-Id: Id15ff8900376aaee4343d7ee08ae062e1c462ce4
Diffstat (limited to 'svx/source/tbxctrls/fillctrl.cxx')
-rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index bd0ca3900705..54c960442ac9 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -502,11 +502,11 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) } } -vcl::Window* SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent) +VclPtr<vcl::Window> SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent) { if(GetSlotId() == SID_ATTR_FILL_STYLE) { - mpFillControl = new FillControl(pParent); + mpFillControl.reset(VclPtr<FillControl>::Create(pParent)); // Thus the FillControl is known by SvxFillToolBoxControl // (and in order to remain compatible) mpFillControl->SetData(this); @@ -528,9 +528,9 @@ vcl::Window* SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent) mpStyleItem = new XFillStyleItem(drawing::FillStyle_SOLID); } - return mpFillControl; + return mpFillControl.get(); } - return NULL; + return VclPtr<vcl::Window>(); } FillControl::FillControl(vcl::Window* pParent,WinBits nStyle) |