diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 16:28:15 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 16:28:22 +0100 |
commit | 667910530deb61563d4812db0995da94e25220e5 (patch) | |
tree | 9e19a2c89c1b9ee8ae3610096d295e99873a3b5c /svtools | |
parent | 7ac254048a5698e046bbb7deccd171cb3777af61 (diff) |
Revert "Switch VclBuilder constructors to use VclPtr."
Behaves oddly; not ready yet.
This reverts commit 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c.
Change-Id: I30d746eac29d1dbe78d3072b10d2e22c051e3f4e
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, 13 insertions, 11 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 556ea85b6a81..60e53181b427 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1130,9 +1130,11 @@ VCL_BUILDER_DECL_FACTORY(SvtFileView) if (bDropdown) nBits |= WB_DROPDOWN; - return VclPtr<SvtFileView>::Create(pParent, nBits, true, true); + return new SvtFileView(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 b13079d3bfda..0bcd09b28a19 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 VclPtr<SvTabListBox>::Create(pParent, nWinStyle); + return new SvTabListBox(pParent, nWinStyle); } SvTabListBox::~SvTabListBox() diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 2c113afc7adf..097adedd94f0 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 VclPtr<SvTreeListBox>::Create(pParent, nWinStyle); + return new SvTreeListBox(pParent, nWinStyle); } void SvTreeListBox::Clear() diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index c7926f10357f..2be6e63e770f 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; - VclPtrInstance<ColorListBox> pListBox(pParent, nWinBits); + ColorListBox *pListBox = new ColorListBox(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; - VclPtrInstance<LineListBox> pListBox(pParent, nWinBits); + LineListBox *pListBox = new LineListBox(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; - VclPtrInstance<FontNameBox> pListBox(pParent, nWinBits); + FontNameBox *pListBox = new FontNameBox(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; - VclPtrInstance<FontStyleBox> pListBox(pParent, nWinBits); + FontStyleBox *pListBox = new FontStyleBox(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; - VclPtrInstance<FontSizeBox> pListBox(pParent, nWinBits); + FontSizeBox* pListBox = new FontSizeBox(pParent, nWinBits); if (bDropdown) pListBox->EnableAutoSize(true); return pListBox; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 29b7eec8c88e..fe9a3ac034e8 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; - VclPtrInstance<SvtURLBox> pListBox(pParent, nWinBits, INetProtocol::NotValid, false); + SvtURLBox* pListBox = new SvtURLBox(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 6edcd8ee0bfe..8a268d75e4c8 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; - VclPtrInstance<OFileURLControl> pListBox(pParent, nWinBits); + OFileURLControl* pListBox = new OFileURLControl(pParent, nWinBits); pListBox->EnableAutoSize(true); return pListBox; } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 070e16aca71a..28bee3593a83 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 VclPtr<ValueSet>::Create(pParent, nWinBits); + return new ValueSet(pParent, nWinBits); } ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) : |