From 667910530deb61563d4812db0995da94e25220e5 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 11 May 2015 16:28:15 +0100 Subject: Revert "Switch VclBuilder constructors to use VclPtr." Behaves oddly; not ready yet. This reverts commit 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c. Change-Id: I30d746eac29d1dbe78d3072b10d2e22c051e3f4e --- sw/source/ui/config/optload.cxx | 4 ++-- sw/source/ui/dbui/createaddresslistdialog.cxx | 2 +- sw/source/ui/dbui/mmaddressblockpage.cxx | 4 ++-- sw/source/ui/fldui/FldRefTreeListBox.cxx | 2 +- sw/source/ui/fldui/fldvar.cxx | 3 ++- sw/source/ui/index/cnttab.cxx | 2 +- sw/source/ui/table/tautofmt.cxx | 2 +- sw/source/uibase/cctrl/actctrl.cxx | 2 +- sw/source/uibase/dbui/dbtree.cxx | 2 +- sw/source/uibase/dbui/mailmergehelper.cxx | 2 +- sw/source/uibase/misc/numberingtypelistbox.cxx | 2 +- sw/source/uibase/utlui/condedit.cxx | 2 +- sw/source/uibase/utlui/numfmtlb.cxx | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) (limited to 'sw') diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 8efc4a547827..424760646e80 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -394,7 +394,7 @@ VCL_BUILDER_DECL_FACTORY(SwCaptionPreview) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nBits |= WB_BORDER; - return VclPtr::Create(pParent, nBits); + return new SwCaptionPreview(pParent, nBits); } void SwCaptionPreview::Init() @@ -940,7 +940,7 @@ VCL_BUILDER_DECL_FACTORY(CaptionComboBox) bool bDropdown = VclBuilder::extractDropdown(rMap); if (bDropdown) nBits |= WB_DROPDOWN; - VclPtrInstance pComboBox(pParent, nBits); + CaptionComboBox* pComboBox = new CaptionComboBox(pParent, nBits); pComboBox->EnableAutoSize(true); return pComboBox; } 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::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::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::Create(pParent, nWinStyle); + return new AddressMultiLineEdit(pParent, nWinStyle); } void AddressMultiLineEdit::SetAddressDialog(SwCustomizeAddressBlockDialog *pParent) diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 313b42bbf0e2..c84b5c45e73b 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -34,7 +34,7 @@ VCL_BUILDER_DECL_FACTORY(SwFldRefTreeListBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr::Create(pParent, nWinStyle); + return new SwFldRefTreeListBox(pParent, nWinStyle); } void SwFldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt ) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 9528c1870025..8da46a400a26 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1276,8 +1276,9 @@ VCL_BUILDER_DECL_FACTORY(SelectionListBox) if (!sBorder.isEmpty()) nBits |= WB_BORDER; - VclPtrInstance pListBox(pParent, nBits|WB_SIMPLEMODE); + SelectionListBox* pListBox = new SelectionListBox(pParent, nBits|WB_SIMPLEMODE); pListBox->EnableAutoSize(true); + return pListBox; } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index f9f3e029f7f7..2bac0f544ae7 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1765,7 +1765,7 @@ VCL_BUILDER_DECL_FACTORY(SwIdxTreeListBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr::Create(pParent, nWinStyle); + return new SwIdxTreeListBox(pParent, nWinStyle); } void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 439057f1215b..3332023cd12f 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -539,7 +539,7 @@ VCL_BUILDER_DECL_FACTORY(AutoFmtPreview) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr::Create(pParent, nWinStyle); + return new AutoFmtPreview(pParent, nWinStyle); } void AutoFmtPreview::Resize() diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index 107048c61967..119dbb39c3af 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 VclPtr::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); + return new ReturnActionEdit(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 13729c613a60..0e9fa0d0f28e 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 VclPtr::Create(pParent, nStyle); + return new SwDBTreeList(pParent, nStyle); } Size SwDBTreeList::GetOptimalSize() const diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 1fcdfd52e634..d827f70e472f 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 VclPtr::Create(pParent, nWinStyle); + return new SwAddressPreview(pParent, nWinStyle); } void SwAddressPreview::positionScrollBar() diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 4e0c96137829..30b6b05a6640 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; - VclPtrInstance pListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); + SwNumberingTypeListBox *pListBox = new SwNumberingTypeListBox(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 9bda327890dd..907ac1f4d5e0 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 VclPtr::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); + return new ConditionEdit(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 adafb24a2c7a..32bab7f225b7 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; - VclPtrInstance pListBox(pParent, nBits|WB_SIMPLEMODE); + NumFormatListBox* pListBox = new NumFormatListBox(pParent, nBits|WB_SIMPLEMODE); if (bDropdown) pListBox->EnableAutoSize(true); -- cgit