diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 13:42:10 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 13:57:27 +0100 |
| commit | ceb6f473837261f2a6e43e028ce9da3daccc2f6c (patch) | |
| tree | a1d3c72cfa773b7cf2c54d4c66c184a4146fa679 /svx/source/tbxctrls | |
| parent | 3fa5ac20a003d2eb0b718a98eb2217749e3133da (diff) | |
tdf#91052 - more macros for 'make' constructors.
Change-Id: Iece86485c52041b66cde91d7fbc772db16d90a93
Diffstat (limited to 'svx/source/tbxctrls')
| -rw-r--r-- | svx/source/tbxctrls/SvxColorValueSet.cxx | 4 | ||||
| -rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index baecf497ec28..ef448a40720a 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -19,7 +19,7 @@ #include <svx/SvxColorValueSet.hxx> #include <svx/xtable.hxx> -#include <vcl/builder.hxx> +#include <vcl/builderfactory.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -29,7 +29,7 @@ SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, WinBits nWinStyle) SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxColorValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(SvxColorValueSet) { WinBits nWinBits = WB_TABSTOP; diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 02f38d5b10b0..0b575c292cf7 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -27,6 +27,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/builderfactory.hxx> #include <svx/dialogs.hrc> @@ -412,12 +413,7 @@ SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent, WinBits nBits ) : Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFillTypeBox(vcl::Window *pParent, VclBuilder::stringmap &) -{ - return new SvxFillTypeBox(pParent); -} - - +VCL_BUILDER_FACTORY(SvxFillTypeBox) bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) { @@ -493,12 +489,7 @@ SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent, WinBits nBits ) : Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFillAttrBox(vcl::Window *pParent, VclBuilder::stringmap &) -{ - return new SvxFillAttrBox(pParent); -} - - +VCL_BUILDER_FACTORY(SvxFillAttrBox) bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) { |