diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 14:02:42 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 15:12:08 +0100 |
commit | 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c (patch) | |
tree | c32e463b68bad8cfc1ab9f69792b8c10071515bf /sw/source/uibase | |
parent | e7473c692cad4c19f1d9eadd2547df4a50875baf (diff) |
Switch VclBuilder constructors to use VclPtr.
Change-Id: Id35a86eb52bbde6ca09a5e61a0b1a79b23be8faf
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/cctrl/actctrl.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbtree.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dbui/mailmergehelper.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/misc/numberingtypelistbox.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/condedit.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/numfmtlb.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index 119dbb39c3af..107048c61967 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -65,7 +65,7 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt) VCL_BUILDER_DECL_FACTORY(ReturnActionEdit) { VclBuilder::ensureDefaultWidthChars(rMap); - return new ReturnActionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); + return VclPtr<ReturnActionEdit>::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 0e9fa0d0f28e..13729c613a60 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -186,7 +186,7 @@ VCL_BUILDER_DECL_FACTORY(SwDBTreeList) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nStyle |= WB_BORDER; - return new SwDBTreeList(pParent, nStyle); + return VclPtr<SwDBTreeList>::Create(pParent, nStyle); } Size SwDBTreeList::GetOptimalSize() const diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index d827f70e472f..1fcdfd52e634 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -213,7 +213,7 @@ VCL_BUILDER_DECL_FACTORY(SwAddressPreview) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return new SwAddressPreview(pParent, nWinStyle); + return VclPtr<SwAddressPreview>::Create(pParent, nWinStyle); } void SwAddressPreview::positionScrollBar() diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 30b6b05a6640..4e0c96137829 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -58,7 +58,7 @@ bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rV VCL_BUILDER_DECL_FACTORY(SwNumberingTypeListBox) { (void)rMap; - SwNumberingTypeListBox *pListBox = new SwNumberingTypeListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); + VclPtrInstance<SwNumberingTypeListBox> pListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); pListBox->EnableAutoSize(true); return pListBox; } diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index 907ac1f4d5e0..9bda327890dd 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/sw/source/uibase/utlui/condedit.cxx @@ -37,7 +37,7 @@ ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle) VCL_BUILDER_DECL_FACTORY(ConditionEdit) { VclBuilder::ensureDefaultWidthChars(rMap); - return new ConditionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); + return VclPtr<ConditionEdit>::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); } // Drop possible, respectively format known? diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index 32bab7f225b7..adafb24a2c7a 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -80,7 +80,7 @@ VCL_BUILDER_DECL_FACTORY(NumFormatListBox) else nBits |= WB_BORDER; - NumFormatListBox* pListBox = new NumFormatListBox(pParent, nBits|WB_SIMPLEMODE); + VclPtrInstance<NumFormatListBox> pListBox(pParent, nBits|WB_SIMPLEMODE); if (bDropdown) pListBox->EnableAutoSize(true); |