basctl/source/basicide/bastype2.cxx | 9 +-------- basctl/source/basicide/moduldl2.cxx | 9 +-------- basctl/source/basicide/moduldlg.cxx | 9 +-------- chart2/source/controller/dialogs/tp_DataSourceControls.cxx | 9 +-------- 4 files changed, 4 insertions(+), 32 deletions(-)
New commits: commit 10197c094b3267adc8071bcef482b64dc291deed Author: melikeyurtoglu <aysemelikeyurto...@gmail.com> Date: Thu Nov 3 00:47:13 2016 +0200 tdf#91222 VclBuilder constructor cleanup Change-Id: Ief4a9dfc0e0a2dad04c3ac9f1840b823fd9357de Signed-off-by: melikeyurtoglu <aysemelikeyurto...@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/30507 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 7b836c8..7b7c64f 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -166,14 +166,7 @@ TreeListBox::TreeListBox (vcl::Window* pParent, WinBits nStyle) nMode = 0xFF; // everything } -VCL_BUILDER_DECL_FACTORY(TreeListBox) -{ - WinBits nWinBits = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinBits |= WB_BORDER; - rRet = VclPtr<TreeListBox>::Create(pParent, nWinBits); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(TreeListBox, WB_TABSTOP) TreeListBox::~TreeListBox () { diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 1b661a8..b51ae9e 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -155,14 +155,7 @@ CheckBox::CheckBox(vcl::Window* pParent, WinBits nStyle) Init(); } -VCL_BUILDER_DECL_FACTORY(CheckBox) -{ - WinBits nWinBits = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinBits |= WB_BORDER; - rRet = VclPtr<CheckBox>::Create(pParent, nWinBits); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(CheckBox, WB_TABSTOP) CheckBox::~CheckBox() { diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 8636097..4d4df19 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -53,14 +53,7 @@ ExtTreeListBox::ExtTreeListBox(vcl::Window* pParent, WinBits nStyle) { } -VCL_BUILDER_DECL_FACTORY(ExtTreeListBox) -{ - WinBits nWinBits = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinBits |= WB_BORDER; - rRet = VclPtr<ExtTreeListBox>::Create(pParent, nWinBits); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(ExtTreeListBox, WB_TABSTOP) bool ExtTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index 10de201..0a31bcb 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -33,14 +33,7 @@ SeriesListBox::SeriesListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) {} -VCL_BUILDER_DECL_FACTORY(SeriesListBox) -{ - WinBits nWinStyle = 0; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SeriesListBox>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SeriesListBox, 0) SvTreeListEntry* SeriesListBox::CreateEntry() const { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits