From 936a49646738452f7331ed9a47ac015db9ee7295 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 11 May 2015 14:02:42 +0100 Subject: Switch VclBuilder constructors to use VclPtr. Change-Id: Id35a86eb52bbde6ca09a5e61a0b1a79b23be8faf --- sd/source/filter/html/htmlattr.cxx | 2 +- sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2 +- sd/source/ui/dlg/dlgassim.cxx | 2 +- sd/source/ui/dlg/dlgctrls.cxx | 2 +- sd/source/ui/dlg/docprev.cxx | 2 +- sd/source/ui/dlg/sdtreelb.cxx | 2 +- sd/source/ui/table/TableDesignPane.cxx | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 3f4db20ae2ed..dd1f4721ad39 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 new SdHtmlAttrPreview(pParent, nWinStyle); + rRet = VclPtr::Create(pParent, nWinStyle); } SdHtmlAttrPreview::~SdHtmlAttrPreview() diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 4c8bcf9df530..bc95d253e4c9 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 new ClientBox(pParent, nWinStyle); + rRet = VclPtr::Create(pParent, nWinStyle); } Size ClientBox::GetOptimalSize() const diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 2c308f7a2021..fdbf21c662f5 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 new SdPageListControl(pParent, nWinStyle); + rRet = VclPtr::Create(pParent, nWinStyle); } IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl) diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 325632103449..ed3c009ebc5c 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 new FadeEffectLB(pParent, nBits); + rRet = VclPtr::Create(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 e0cba089de3e..a9e219425dfa 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 new SdDocPreviewWin(pParent, nWinStyle); + rRet = VclPtr::Create(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 0a3c3f4f2dec..d0c786403de6 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 new SdPageObjsTLB(pParent, nWinStyle); + rRet = VclPtr::Create(pParent, nWinStyle); } SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable() diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index a4ecc26871b9..aac2f0f4add7 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 new TableValueSet(pParent, nWinStyle); + rRet = VclPtr::Create(pParent, nWinStyle); } void TableDesignWidget::updateControls() -- cgit tion value='distro/collabora/lof-4.3'>distro/collabora/lof-4.3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-25Fix typosAndrea Gelmini
Change-Id: I14dca0d55c09187690dc1d94936c40b890ca5cea Reviewed-on: https://gerrit.libreoffice.org/35637 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2016-07-04Fix some spelling errors in comments and stringsOtto Kekäläinen
Change-Id: Iecd6b5e13d6be14651f77d8e37f01117ba15a11e Reviewed-on: https://gerrit.libreoffice.org/26883 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-05-17odk: add missing modelinesMiklos Vajna
Change-Id: I0bd2d761b5a75681c8c3e53664084dd3b8176107 Reviewed-on: https://gerrit.libreoffice.org/25051 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2014-11-18java: make fields final where possibleNoel Grandin
found by PMD Change-Id: I87780366119c141cd2dafe6ca1bf2d9798b10aec
2014-11-12java: convert fields to local variables where possibleNoel Grandin
found by PMD Change-Id: I05b45382b8fb1b734657ce9421a20e6ef6fbe542 Reviewed-on: https://gerrit.libreoffice.org/12376 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>