diff options
-rw-r--r-- | svx/source/dialog/checklbx.cxx | 9 | ||||
-rw-r--r-- | svx/source/dialog/connctrl.cxx | 9 | ||||
-rw-r--r-- | svx/source/dialog/fntctrl.cxx | 9 | ||||
-rw-r--r-- | svx/source/dialog/fontlb.cxx | 9 | ||||
-rw-r--r-- | svx/source/dialog/graphctl.cxx | 9 | ||||
-rw-r--r-- | svx/source/dialog/measctrl.cxx | 9 | ||||
-rw-r--r-- | svx/source/gallery2/galctrl.cxx | 9 | ||||
-rw-r--r-- | svx/source/tbxctrls/SvxColorValueSet.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/fldui/FldRefTreeListBox.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 9 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbtree.cxx | 9 | ||||
-rw-r--r-- | sw/source/uibase/dbui/mailmergehelper.cxx | 9 |
13 files changed, 13 insertions, 106 deletions
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index e2c230272868..3e3789e13dfc 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -31,14 +31,7 @@ SvxCheckListBox::SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle ) : Init_Impl(); } -VCL_BUILDER_DECL_FACTORY(SvxCheckListBox) -{ - WinBits nWinStyle = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SvxCheckListBox>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxCheckListBox, WB_TABSTOP) void SvxCheckListBox::SetNormalStaticImage(const Image& rNormalStaticImage) { diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 807f361489b2..a81710f8674f 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -46,14 +46,7 @@ SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nSty SetStyles(); } -VCL_BUILDER_DECL_FACTORY(SvxXConnectionPreview) -{ - WinBits nWinStyle = 0; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SvxXConnectionPreview>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxXConnectionPreview, 0) SvxXConnectionPreview::~SvxXConnectionPreview() { diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 177578509610..744b9a127118 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -511,14 +511,7 @@ SvxFontPrevWindow::SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle) Init(); } -VCL_BUILDER_DECL_FACTORY(SvxFontPrevWindow) -{ - WinBits nWinStyle = 0; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SvxFontPrevWindow>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxFontPrevWindow, 0) SvxFontPrevWindow::~SvxFontPrevWindow() { diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 265e5c1c2b60..151329a5f524 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -87,14 +87,7 @@ SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle) maEntryFont = maStdFont; } -VCL_BUILDER_DECL_FACTORY(SvxFontListBox) -{ - WinBits nWinStyle = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SvxFontListBox>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxFontListBox, WB_TABSTOP) void SvxFontListBox::InsertFontEntry( const OUString& rString, const vcl::Font& rFont, const Color* pColor ) { diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 6cd7ca83500e..0ae7f1c70dc2 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -76,14 +76,7 @@ GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) : EnableRTL( false ); } -VCL_BUILDER_DECL_FACTORY(GraphCtrl) -{ - WinBits nWinStyle = 0; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<GraphCtrl>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(GraphCtrl, 0) GraphCtrl::~GraphCtrl() { diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 37d005ef6f4b..78e2a456103d 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -63,14 +63,7 @@ void SvxXMeasurePreview::Resize() pMeasureObj->SetPoint(aPt2, 1); } -VCL_BUILDER_DECL_FACTORY(SvxXMeasurePreview) -{ - WinBits nWinStyle = 0; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SvxXMeasurePreview>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxXMeasurePreview, 0) Size SvxXMeasurePreview::GetOptimalSize() const { diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 117997126d8e..d2021087d852 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -48,14 +48,7 @@ GalleryPreview::GalleryPreview(vcl::Window* pParent, WinBits nStyle, GalleryThem InitSettings(); } -VCL_BUILDER_DECL_FACTORY(GalleryPreview) -{ - WinBits nWinBits = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinBits |= WB_BORDER; - rRet = VclPtr<GalleryPreview>::Create(pParent, nWinBits); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(GalleryPreview, WB_TABSTOP) Size GalleryPreview::GetOptimalSize() const { diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 52ee3f7c3a3d..cde72ac18c96 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -29,16 +29,7 @@ SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, WinBits nWinStyle) SetEdgeBlending(true); } -VCL_BUILDER_DECL_FACTORY(SvxColorValueSet) -{ - WinBits nWinBits = WB_TABSTOP; - - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinBits |= WB_BORDER; - - rRet = VclPtr<SvxColorValueSet>::Create(pParent, nWinBits); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxColorValueSet, WB_TABSTOP) sal_uInt32 SvxColorValueSet::getMaxRowCount() { diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 976230e86f30..436b2740a9ca 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -28,14 +28,7 @@ SwFieldRefTreeListBox::SwFieldRefTreeListBox(vcl::Window* pParent, WinBits nStyl { } -VCL_BUILDER_DECL_FACTORY(SwFieldRefTreeListBox) -{ - WinBits nWinStyle = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SwFieldRefTreeListBox>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SwFieldRefTreeListBox, WB_TABSTOP) void SwFieldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index bb91b4362091..57a62d38c37b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1756,14 +1756,7 @@ void SwIdxTreeListBox::dispose() SvTreeListBox::dispose(); } -VCL_BUILDER_DECL_FACTORY(SwIdxTreeListBox) -{ - WinBits nWinStyle = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SwIdxTreeListBox>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SwIdxTreeListBox, WB_TABSTOP) void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index c1bf217d29cd..df74f780cc88 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -523,14 +523,7 @@ AutoFormatPreview::AutoFormatPreview(vcl::Window* pParent, WinBits nStyle) : Init(); } -VCL_BUILDER_DECL_FACTORY(AutoFormatPreview) -{ - WinBits nWinStyle = 0; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<AutoFormatPreview>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(AutoFormatPreview, 0) void AutoFormatPreview::Resize() { diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index a91511610f1f..8ff07ac75b37 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -153,14 +153,7 @@ SwDBTreeList::SwDBTreeList(vcl::Window *pParent, WinBits nStyle) InitTreeList(); } -VCL_BUILDER_DECL_FACTORY(SwDBTreeList) -{ - WinBits nStyle = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nStyle |= WB_BORDER; - rRet = VclPtr<SwDBTreeList>::Create(pParent, nStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SwDBTreeList, WB_TABSTOP) Size SwDBTreeList::GetOptimalSize() const { diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index c6255e87b5cb..9910fe0756f8 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -200,14 +200,7 @@ void SwAddressPreview::dispose() vcl::Window::dispose(); } -VCL_BUILDER_DECL_FACTORY(SwAddressPreview) -{ - WinBits nWinStyle = WB_TABSTOP; - OString sBorder = VclBuilder::extractCustomProperty(rMap); - if (!sBorder.isEmpty()) - nWinStyle |= WB_BORDER; - rRet = VclPtr<SwAddressPreview>::Create(pParent, nWinStyle); -} +VCL_BUILDER_FACTORY_CONSTRUCTOR(SwAddressPreview, WB_TABSTOP) void SwAddressPreview::positionScrollBar() { |