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 /sw/source/ui/config | |
| parent | 3fa5ac20a003d2eb0b718a98eb2217749e3133da (diff) | |
tdf#91052 - more macros for 'make' constructors.
Change-Id: Iece86485c52041b66cde91d7fbc772db16d90a93
Diffstat (limited to 'sw/source/ui/config')
| -rw-r--r-- | sw/source/ui/config/optload.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/config/optpage.cxx | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 5f0cc8b5222c..424760646e80 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -43,7 +43,7 @@ #include <svtools/insdlg.hxx> #include <svtools/treelistentry.hxx> -#include <vcl/builder.hxx> +#include <vcl/builderfactory.hxx> #include <vcl/settings.hxx> #include <comphelper/classids.hxx> @@ -388,7 +388,7 @@ SwCaptionPreview::SwCaptionPreview( vcl::Window* pParent, WinBits nStyle ) Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwCaptionPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(SwCaptionPreview) { WinBits nBits = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -934,7 +934,7 @@ void CaptionComboBox::KeyInput(const KeyEvent& rEvt) SwComboBox::KeyInput(rEvt); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCaptionComboBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(CaptionComboBox) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 9d5e019b17ef..fa53537079a2 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -65,6 +65,7 @@ #include <svx/strarray.hxx> #include <vcl/settings.hxx> +#include <vcl/builderfactory.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; @@ -1614,10 +1615,7 @@ SwMarkPreview::SwMarkPreview( vcl::Window *pParent, WinBits nWinBits ) : SetMapMode(MAP_PIXEL); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwMarkPreview(vcl::Window *pParent, VclBuilder::stringmap &) -{ - return new SwMarkPreview(pParent, 0); -} +VCL_BUILDER_FACTORY_ARGS(SwMarkPreview, 0) SwMarkPreview::~SwMarkPreview() { |