tdf#91222 VclBuilder constructor cleanup

Change-Id: I619cb50c3475519921ffd318b32875ae4ff2c0b8
Signed-off-by: melikeyurtoglu <aysemelikeyurtoglu@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/30545
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
melikeyurtoglu
2016-11-04 00:37:54 +02:00
committed by Noel Grandin
parent fc8f32adc2
commit 02eaf40ba0
8 changed files with 8 additions and 70 deletions

View File

@@ -300,14 +300,7 @@ namespace pcr
SetSelectionMode( SelectionMode::Multiple );
}
VCL_BUILDER_DECL_FACTORY(TabOrderListBox)
{
WinBits nWinStyle = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
rRet = VclPtr<TabOrderListBox>::Create(pParent, nWinStyle);
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(TabOrderListBox, WB_TABSTOP)
TabOrderListBox::~TabOrderListBox()
{

View File

@@ -199,14 +199,7 @@ public:
}
};
VCL_BUILDER_DECL_FACTORY(ScanPreview)
{
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
rRet = VclPtr<ScanPreview>::Create(pParent, nWinStyle);
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(ScanPreview, 0)
SaneDlg::SaneDlg( vcl::Window* pParent, Sane& rSane, bool bScanEnabled ) :
ModalDialog(pParent, "SaneDialog", "modules/scanner/ui/sanedialog.ui"),

View File

@@ -144,16 +144,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
RecalcAll();
}
VCL_BUILDER_DECL_FACTORY(ScCondFormatList)
{
WinBits nWinBits = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinBits |= WB_BORDER;
rRet = VclPtr<ScCondFormatList>::Create(pParent, nWinBits);
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(ScCondFormatList, 0)
Size ScCondFormatList::GetOptimalSize() const
{

View File

@@ -27,16 +27,7 @@ SdHtmlAttrPreview::SdHtmlAttrPreview(vcl::Window* pParent, WinBits nStyle)
{
}
VCL_BUILDER_DECL_FACTORY(SdHtmlAttrPreview)
{
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
rRet = VclPtr<SdHtmlAttrPreview>::Create(pParent, nWinStyle);
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(SdHtmlAttrPreview, 0)
SdHtmlAttrPreview::~SdHtmlAttrPreview()
{

View File

@@ -108,14 +108,7 @@ ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) :
Show();
}
VCL_BUILDER_DECL_FACTORY(ClientBox)
{
WinBits nWinStyle = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
rRet = VclPtr<ClientBox>::Create(pParent, nWinStyle);
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(ClientBox, WB_TABSTOP)
Size ClientBox::GetOptimalSize() const
{

View File

@@ -50,16 +50,7 @@ using namespace ::com::sun::star::uno;
const int SdDocPreviewWin::FRAME = 4;
VCL_BUILDER_DECL_FACTORY(SdDocPreviewWin)
{
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
rRet = VclPtr<SdDocPreviewWin>::Create(pParent, nWinStyle);
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(SdDocPreviewWin, 0)
SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle )
: Control(pParent, nStyle), pMetaFile( nullptr )

View File

@@ -96,14 +96,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
rParent.SetupDragOrigin();
}
VCL_BUILDER_DECL_FACTORY(SdPageObjsTLB)
{
WinBits nWinStyle = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
rRet = VclPtr<SdPageObjsTLB>::Create(pParent, nWinStyle);
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(SdPageObjsTLB, WB_TABSTOP)
SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable()
{

View File

@@ -359,14 +359,7 @@ void TableValueSet::updateSettings()
}
}
VCL_BUILDER_DECL_FACTORY(TableValueSet)
{
WinBits nWinStyle = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
rRet = VclPtr<TableValueSet>::Create(pParent, nWinStyle);
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(TableValueSet, WB_TABSTOP)
void TableDesignWidget::updateControls()
{