[Libreoffice-commits] core.git: svtools/source

[melikeyurtoglu]

 svtools/source/contnr/svtabbx.cxx     |    9 +--------
 svtools/source/contnr/treelistbox.cxx |    9 +--------
 svtools/source/control/valueset.cxx   |   11 +----------
 3 files changed, 3 insertions(+), 26 deletions(-)

New commits:
commit 69d08efffeca1e38fce7b04226894871279a1696
Author: melikeyurtoglu <aysemelikeyurtoglu at gmail.com>
Date:   Thu Nov 17 07:50:30 2016 +0200

    tdf#91222 VclBuilder constructor cleanup
    
    Change-Id: I367c2096b3c0d508bca1e207c78c2f955f51e263
    Signed-off-by: melikeyurtoglu <aysemelikeyurtoglu at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/30921
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index c99df45..12c6934 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -95,14 +95,7 @@ SvTabListBox::SvTabListBox( vcl::Window* pParent, WinBits nBits )
     SetHighlightRange();    // select full width
 }
 
-VCL_BUILDER_DECL_FACTORY(SvTabListBox)
-{
-    WinBits nWinStyle = WB_TABSTOP;
-    OString sBorder = VclBuilder::extractCustomProperty(rMap);
-    if (!sBorder.isEmpty())
-        nWinStyle |= WB_BORDER;
-    rRet = VclPtr<SvTabListBox>::Create(pParent, nWinStyle);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SvTabListBox, WB_TABSTOP)
 
 SvTabListBox::~SvTabListBox()
 {
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 6ab4ab7..5052c0a 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -363,14 +363,7 @@ SvTreeListBox::SvTreeListBox(vcl::Window* pParent, WinBits nWinStyle) :
     SetSublistOpenWithLeftRight();
 }
 
-VCL_BUILDER_DECL_FACTORY(SvTreeListBox)
-{
-    WinBits nWinStyle = WB_TABSTOP;
-    OString sBorder = VclBuilder::extractCustomProperty(rMap);
-    if (!sBorder.isEmpty())
-        nWinStyle |= WB_BORDER;
-    rRet = VclPtr<SvTreeListBox>::Create(pParent, nWinStyle);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SvTreeListBox, WB_TABSTOP)
 
 void SvTreeListBox::Clear()
 {
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index a0dc24f..b275990 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -99,16 +99,7 @@ ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle ) :
 }
 
 
-VCL_BUILDER_DECL_FACTORY(ValueSet)
-{
-    WinBits nWinBits = WB_TABSTOP;
-
-    OString sBorder = VclBuilder::extractCustomProperty(rMap);
-    if (!sBorder.isEmpty())
-       nWinBits |= WB_BORDER;
-
-    rRet = VclPtr<ValueSet>::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(ValueSet, WB_TABSTOP)
 
 ValueSet::~ValueSet()
 {