diff options
| author | melikeyurtoglu <aysemelikeyurtoglu@gmail.com> | 2016-11-03 02:35:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-03 06:37:42 +0000 |
| commit | 164d8e3b1aa660d65c1af9570e67b66520bd953a (patch) | |
| tree | 97506a9a691a08b50a2290606e58a35cd1c2fe73 /cui/source/dialogs | |
| parent | tdf#91222 VclBuilder constructor cleanup (diff) | |
| download | core-164d8e3b1aa660d65c1af9570e67b66520bd953a.tar.gz core-164d8e3b1aa660d65c1af9570e67b66520bd953a.zip | |
tdf#91222 VclBuilder constructor cleanup
Change-Id: I53bca2a9113862b8e7058937e231721c5f81a9de
Signed-off-by: melikeyurtoglu <aysemelikeyurtoglu@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/30511
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source/dialogs')
| -rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 33 | ||||
| -rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 13 | ||||
| -rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 9 |
3 files changed, 5 insertions, 50 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 5591310489c7..5299989c9e57 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -166,16 +166,7 @@ ColorPreviewControl::ColorPreviewControl(vcl::Window* pParent, WinBits nStyle) { } -VCL_BUILDER_DECL_FACTORY(ColorPreviewControl) -{ - WinBits nBits = 0; - - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nBits |= WB_BORDER; - - rRet = VclPtr<ColorPreviewControl>::Create(pParent, nBits); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(ColorPreviewControl, 0) void ColorPreviewControl::SetColor( const Color& rCol ) { @@ -263,16 +254,7 @@ void ColorFieldControl::dispose() Control::dispose(); } -VCL_BUILDER_DECL_FACTORY(ColorFieldControl) -{ - WinBits nBits = 0; - - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nBits |= WB_BORDER; - - rRet = VclPtr<ColorFieldControl>::Create(pParent, nBits); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(ColorFieldControl, 0) Size ColorFieldControl::GetOptimalSize() const { @@ -665,16 +647,7 @@ void ColorSliderControl::dispose() Control::dispose(); } -VCL_BUILDER_DECL_FACTORY(ColorSliderControl) -{ - WinBits nBits = 0; - - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nBits |= WB_BORDER; - - rRet = VclPtr<ColorSliderControl>::Create(pParent, nBits); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(ColorSliderControl, 0) void ColorSliderControl::UpdateBitmap() { diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 43217dc39d96..c6928c25e029 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -38,18 +38,7 @@ GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent, { } - -VCL_BUILDER_DECL_FACTORY(GraphicPreviewWindow) -{ - WinBits nWinBits = WB_TABSTOP; - - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinBits |= WB_BORDER; - - rRet = VclPtr<GraphicPreviewWindow>::Create(pParent, nWinBits); -} - +VCL_BUILDER_FACTORY_CONSTRUCTOR(GraphicPreviewWindow, WB_TABSTOP) Size GraphicPreviewWindow::GetOptimalSize() const { diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index f2087cc4840e..a7d6d2f3681d 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -84,14 +84,7 @@ void SvxHlmarkTreeLBox::dispose() SvTreeListBox::dispose(); } -VCL_BUILDER_DECL_FACTORY(SvxHlmarkTreeLBox) -{ - WinBits nWinStyle = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SvxHlmarkTreeLBox>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxHlmarkTreeLBox, WB_TABSTOP) Size SvxHlmarkTreeLBox::GetOptimalSize() const { |