desktop/source/deployment/gui/license_dialog.cxx | 9 +--------
sc/source/ui/dbgui/pvfundlg.cxx | 9 +--------
svx/source/tbxctrls/SvxPresetListBox.cxx | 10 +---------
sw/source/ui/dbui/mmaddressblockpage.cxx | 10 ++--------
4 files changed, 5 insertions(+), 33 deletions(-)
New commits:
commit bb4cf1da125344d5ef4fe51b0f1549718a11affa
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue Mar 7 22:39:40 2017 +0100
tdf#91222 VclBuilder constructor cleanup
Change-Id: I951bfda566e0aae3b0a82f30be28e66601797cc8
Reviewed-on: https://gerrit.libreoffice.org/34958
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/desktop/source/deployment/gui/license_dialog.cxx
b/desktop/source/deployment/gui/license_dialog.cxx
index 52ddc8e..12542e6 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -120,14 +120,7 @@ LicenseView::LicenseView( vcl::Window* pParent, WinBits
nStyle )
StartListening( *GetTextEngine() );
}
-VCL_BUILDER_DECL_FACTORY(LicenseView)
-{
- WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT;
- OString sBorder = VclBuilder::extractCustomProperty(rMap);
- if (!sBorder.isEmpty())
- nWinStyle |= WB_BORDER;
- rRet = VclPtr<LicenseView>::Create(pParent, nWinStyle | WB_VSCROLL);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(LicenseView,
WB_CLIPCHILDREN|WB_LEFT|WB_VSCROLL)
LicenseView::~LicenseView()
{
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 940ab46..4dcecad 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -157,14 +157,7 @@ ScDPFunctionListBox::ScDPFunctionListBox(vcl::Window*
pParent, WinBits nStyle)
FillFunctionNames();
}
-VCL_BUILDER_DECL_FACTORY(ScDPFunctionListBox)
-{
- WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
- OString sBorder = VclBuilder::extractCustomProperty(rMap);
- if (!sBorder.isEmpty())
- nWinStyle |= WB_BORDER;
- rRet = VclPtr<ScDPFunctionListBox>::Create(pParent, nWinStyle);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(ScDPFunctionListBox,
WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE)
void ScDPFunctionListBox::SetSelection( PivotFunc nFuncMask )
{
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx
b/svx/source/tbxctrls/SvxPresetListBox.cxx
index c0b3ed1..89f96da 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -37,16 +37,8 @@ SvxPresetListBox::SvxPresetListBox(vcl::Window* pParent,
WinBits nWinStyle)
SetExtraSpacing(4);
}
-VCL_BUILDER_DECL_FACTORY(SvxPresetListBox)
-{
- WinBits nWinBits = WB_TABSTOP;
- OString sBorder = VclBuilder::extractCustomProperty(rMap);
- if(!sBorder.isEmpty())
- nWinBits |= WB_BORDER;
- nWinBits |= (WB_ITEMBORDER| WB_3DLOOK|WB_OWNERDRAWDECORATION);
- rRet = VclPtr<SvxPresetListBox>::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxPresetListBox, WB_ITEMBORDER|
WB_3DLOOK|WB_OWNERDRAWDECORATION|WB_TABSTOP)
void SvxPresetListBox::Resize()
{
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 335127b..af25e2d 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1324,14 +1324,8 @@ Size AddressMultiLineEdit::GetOptimalSize() const
return LogicToPixel(Size(160, 60), MapUnit::MapAppFont);
}
-VCL_BUILDER_DECL_FACTORY(AddressMultiLineEdit)
-{
- WinBits nWinStyle = WB_LEFT|WB_TABSTOP;
- OString sBorder = VclBuilder::extractCustomProperty(rMap);
- if (!sBorder.isEmpty())
- nWinStyle |= WB_BORDER;
- rRet = VclPtr<AddressMultiLineEdit>::Create(pParent, nWinStyle);
-}
+
+VCL_BUILDER_FACTORY_CONSTRUCTOR(AddressMultiLineEdit, WB_LEFT|WB_TABSTOP)
void AddressMultiLineEdit::SetAddressDialog(SwCustomizeAddressBlockDialog
*pParent)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
