mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#91222 VclBuilder constructor cleanup

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/source/propctrlr/taborder.cxx
View File

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

9
extensions/source/scanner/sanedlg.cxx
View File

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

11
sc/source/ui/condformat/condformatdlg.cxx
View File

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

11
sd/source/filter/html/htmlattr.cxx
View File

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

9
sd/source/ui/dlg/RemoteDialogClientBox.cxx
View File

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

11
sd/source/ui/dlg/docprev.cxx
View File

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

9
sd/source/ui/dlg/sdtreelb.cxx
View File

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

9
sd/source/ui/table/TableDesignPane.cxx
View File

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