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 /sd | |
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 'sd')
-rw-r--r-- | sd/source/filter/html/htmlattr.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/dlgassim.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/dlgctrls.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/docprev.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 403da9e996c9..3f4db20ae2ed 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -35,7 +35,7 @@ VCL_BUILDER_DECL_FACTORY(SdHtmlAttrPreview) if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<SdHtmlAttrPreview>::Create(pParent, nWinStyle); + return new SdHtmlAttrPreview(pParent, nWinStyle); } SdHtmlAttrPreview::~SdHtmlAttrPreview() diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 0aca3c7fbfbd..4c8bcf9df530 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -115,7 +115,7 @@ VCL_BUILDER_DECL_FACTORY(ClientBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<ClientBox>::Create(pParent, nWinStyle); + return new ClientBox(pParent, nWinStyle); } Size ClientBox::GetOptimalSize() const diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index b281431d3de2..2c308f7a2021 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -55,7 +55,7 @@ VCL_BUILDER_DECL_FACTORY(SdPageListControl) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<SdPageListControl>::Create(pParent, nWinStyle); + return new SdPageListControl(pParent, nWinStyle); } IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl) diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 8eda4c4ee1e1..325632103449 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -81,7 +81,7 @@ VCL_BUILDER_DECL_FACTORY(FadeEffectLB) if (bDropdown) nBits |= WB_DROPDOWN; - return VclPtr<FadeEffectLB>::Create(pParent, nBits); + return new FadeEffectLB(pParent, nBits); } void FadeEffectLB::applySelected( SdPage* pSlide ) const diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 6e71e3c0412d..e0cba089de3e 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -70,7 +70,7 @@ VCL_BUILDER_DECL_FACTORY(SdDocPreviewWin) if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<SdDocPreviewWin>::Create(pParent, nWinStyle); + return new SdDocPreviewWin(pParent, nWinStyle); } SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 4a1bf4b8a1d5..0a3c3f4f2dec 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -104,7 +104,7 @@ VCL_BUILDER_DECL_FACTORY(SdPageObjsTLB) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<SdPageObjsTLB>::Create(pParent, nWinStyle); + return new SdPageObjsTLB(pParent, nWinStyle); } SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable() diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 0d708e6a7c5c..a4ecc26871b9 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -372,7 +372,7 @@ VCL_BUILDER_DECL_FACTORY(TableValueSet) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<TableValueSet>::Create(pParent, nWinStyle); + return new TableValueSet(pParent, nWinStyle); } void TableDesignWidget::updateControls() |