diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 09:35:06 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 13:07:45 +0100 |
| commit | b01554bcdaca076f900c25b672fd691dbe76c9db (patch) | |
| tree | d9c542e48970d841f39c6b429ed418f8995ffc1a /svtools/source/control/ctrlbox.cxx | |
| parent | fa9eb2512983b20510be3681fad379573b58fc72 (diff) | |
tdf#91052 - more macros for 'make' constructors.
Change-Id: Ic7ff127e2793993f9dcf1018f8d5ed4f2858a2c4
Diffstat (limited to 'svtools/source/control/ctrlbox.cxx')
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 8e397e4de9cc..2be6e63e770f 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -21,7 +21,7 @@ #include <i18nutil/unicode.hxx> #include <tools/stream.hxx> -#include <vcl/builder.hxx> +#include <vcl/builderfactory.hxx> #include <vcl/svapp.hxx> #include <vcl/field.hxx> #include <vcl/helper.hxx> @@ -104,7 +104,7 @@ ColorListBox::ColorListBox( vcl::Window* pParent, const ResId& rResId ) : SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(ColorListBox) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -736,7 +736,7 @@ LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) : ImplInit(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(LineListBox) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -939,7 +939,7 @@ FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) : InitFontMRUEntriesFile(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontNameBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(FontNameBox) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -1327,7 +1327,7 @@ Size FontStyleBox::GetOptimalSize() const return ComboBox::GetOptimalSize(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontStyleBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(FontStyleBox) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -1523,7 +1523,7 @@ FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits nWinSize ) : ImplInit(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontSizeBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(FontSizeBox) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; |