starmath/source/dialog.cxx | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-)
New commits: commit c5f5b3e5334c52502c1de28828a44ad469c68850 Author: melikeyurtoglu <[email protected]> Date: Sun Nov 13 20:15:36 2016 +0200 tdf#91222 VclBuilder constructor cleanup Change-Id: I29a8ca55d1d9f319cd57e5e30fa7e58e4d91dc5c Signed-off-by: melikeyurtoglu <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/30810 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index d4f3192..3dd2f919 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -277,16 +277,7 @@ void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRec (rRenderContext.GetOutputSize().Height() - aTextSize.Height()) / 2), sText); } -VCL_BUILDER_DECL_FACTORY(SmShowFont) -{ - WinBits nWinStyle = 0; - - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - - rRet = VclPtr<SmShowFont>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SmShowFont, 0) Size SmShowFont::GetOptimalSize() const { @@ -1351,16 +1342,7 @@ IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/, void) Invalidate(); } -VCL_BUILDER_DECL_FACTORY(SmShowSymbol) -{ - WinBits nWinStyle = 0; - - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - - rRet = VclPtr<SmShowSymbol>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SmShowSymbol, 0) void SmShowSymbol::Resize() { @@ -1637,16 +1619,7 @@ const SmSym* SmSymbolDialog::GetSymbol() const return bValid ? aSymbolSet[ nSymbolNo ] : nullptr; } -VCL_BUILDER_DECL_FACTORY(SmShowChar) -{ - WinBits nWinStyle = 0; - - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - - rRet = VclPtr<SmShowChar>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SmShowChar, 0) void SmShowChar::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
