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 /sw/source/ui/dbui | |
| 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 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index dffdc5977e1d..a9c122664ca4 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -111,7 +111,7 @@ SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits VCL_BUILDER_DECL_FACTORY(SwAddressControlImpl) { (void)rMap; - return VclPtr<SwAddressControl_Impl>::Create(pParent, WB_BORDER | WB_DIALOGCONTROL); + return new SwAddressControl_Impl(pParent, WB_BORDER | WB_DIALOGCONTROL); } SwAddressControl_Impl::~SwAddressControl_Impl() diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 0beb28e1abde..2c25df2e318d 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1292,7 +1292,7 @@ VCL_BUILDER_DECL_FACTORY(DDListBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<DDListBox>::Create(pParent, nWinStyle); + return new DDListBox(pParent, nWinStyle); } void DDListBox::SetAddressDialog(SwCustomizeAddressBlockDialog *pParent) @@ -1354,7 +1354,7 @@ VCL_BUILDER_DECL_FACTORY(AddressMultiLineEdit) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<AddressMultiLineEdit>::Create(pParent, nWinStyle); + return new AddressMultiLineEdit(pParent, nWinStyle); } void AddressMultiLineEdit::SetAddressDialog(SwCustomizeAddressBlockDialog *pParent) |