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 /svtools | |
parent | e7473c692cad4c19f1d9eadd2547df4a50875baf (diff) |
Switch VclBuilder constructors to use VclPtr.
Change-Id: Id35a86eb52bbde6ca09a5e61a0b1a79b23be8faf
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 4 | ||||
-rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 10 | ||||
-rw-r--r-- | svtools/source/control/inettbc.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/urlcontrol.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/valueset.cxx | 2 |
7 files changed, 11 insertions, 13 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 60e53181b427..556ea85b6a81 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1130,11 +1130,9 @@ VCL_BUILDER_DECL_FACTORY(SvtFileView) if (bDropdown) nBits |= WB_DROPDOWN; - return new SvtFileView(pParent, nBits, true, true); + return VclPtr<SvtFileView>::Create(pParent, nBits, true, true); } - - Size SvtFileView::GetOptimalSize() const { return LogicToPixel(Size(208, 50), MAP_APPFONT); diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 0bcd09b28a19..b13079d3bfda 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -104,7 +104,7 @@ VCL_BUILDER_DECL_FACTORY(SvTabListBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return new SvTabListBox(pParent, nWinStyle); + return VclPtr<SvTabListBox>::Create(pParent, nWinStyle); } SvTabListBox::~SvTabListBox() diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 097adedd94f0..2c113afc7adf 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -440,7 +440,7 @@ VCL_BUILDER_DECL_FACTORY(SvTreeListBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return new SvTreeListBox(pParent, nWinStyle); + return VclPtr<SvTreeListBox>::Create(pParent, nWinStyle); } void SvTreeListBox::Clear() diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 2be6e63e770f..c7926f10357f 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -110,7 +110,7 @@ VCL_BUILDER_DECL_FACTORY(ColorListBox) WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; if (bDropdown) nWinBits |= WB_DROPDOWN; - ColorListBox *pListBox = new ColorListBox(pParent, nWinBits); + VclPtrInstance<ColorListBox> pListBox(pParent, nWinBits); if (bDropdown) pListBox->EnableAutoSize(true); return pListBox; @@ -742,7 +742,7 @@ VCL_BUILDER_DECL_FACTORY(LineListBox) WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; if (bDropdown) nWinBits |= WB_DROPDOWN; - LineListBox *pListBox = new LineListBox(pParent, nWinBits); + VclPtrInstance<LineListBox> pListBox(pParent, nWinBits); if (bDropdown) pListBox->EnableAutoSize(true); return pListBox; @@ -945,7 +945,7 @@ VCL_BUILDER_DECL_FACTORY(FontNameBox) WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; if (bDropdown) nWinBits |= WB_DROPDOWN; - FontNameBox *pListBox = new FontNameBox(pParent, nWinBits); + VclPtrInstance<FontNameBox> pListBox(pParent, nWinBits); if (bDropdown) pListBox->EnableAutoSize(true); return pListBox; @@ -1333,7 +1333,7 @@ VCL_BUILDER_DECL_FACTORY(FontStyleBox) WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; if (bDropdown) nWinBits |= WB_DROPDOWN; - FontStyleBox *pListBox = new FontStyleBox(pParent, nWinBits); + VclPtrInstance<FontStyleBox> pListBox(pParent, nWinBits); if (bDropdown) pListBox->EnableAutoSize(true); return pListBox; @@ -1529,7 +1529,7 @@ VCL_BUILDER_DECL_FACTORY(FontSizeBox) WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; if (bDropdown) nWinBits |= WB_DROPDOWN; - FontSizeBox* pListBox = new FontSizeBox(pParent, nWinBits); + VclPtrInstance<FontSizeBox> pListBox(pParent, nWinBits); if (bDropdown) pListBox->EnableAutoSize(true); return pListBox; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index fe9a3ac034e8..29b7eec8c88e 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -868,7 +868,7 @@ VCL_BUILDER_DECL_FACTORY(SvtURLBox) (void)rMap; WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; - SvtURLBox* pListBox = new SvtURLBox(pParent, nWinBits, INetProtocol::NotValid, false); + VclPtrInstance<SvtURLBox> pListBox(pParent, nWinBits, INetProtocol::NotValid, false); pListBox->EnableAutoSize(true); return pListBox; } diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index 8a268d75e4c8..6edcd8ee0bfe 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -36,7 +36,7 @@ namespace svt (void)rMap; WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; - OFileURLControl* pListBox = new OFileURLControl(pParent, nWinBits); + VclPtrInstance<OFileURLControl> pListBox(pParent, nWinBits); pListBox->EnableAutoSize(true); return pListBox; } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 28bee3593a83..070e16aca71a 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -111,7 +111,7 @@ VCL_BUILDER_DECL_FACTORY(ValueSet) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new ValueSet(pParent, nWinBits); + return VclPtr<ValueSet>::Create(pParent, nWinBits); } ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) : |