diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-09 16:46:56 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-09 20:37:54 +0100 |
| commit | cf6bfd666843c1cfc75e453e6e7f0405173a1831 (patch) | |
| tree | e5e014f79b7f89861b7499e36e2eff677de14e1e /chart2 | |
| parent | d1b7aa568ac949d55f6512add9c9ec369c3ef1db (diff) | |
tdf#91052 - use macros to standardize 'make' constructors for VclBuilder.
When complete - should ease the switch to VclPtr<>::Create.
Change-Id: Idf876e2eeb830b36dd86e84317277cc88e1dc013
Diffstat (limited to 'chart2')
3 files changed, 6 insertions, 10 deletions
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index c3f5e309a36b..a2fd92385738 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -22,7 +22,7 @@ #include "Strings.hrc" #include <svl/languageoptions.hxx> #include <vcl/window.hxx> -#include <vcl/builder.hxx> +#include <vcl/builderfactory.hxx> namespace chart { @@ -42,10 +42,7 @@ TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent, vcl::Window* p } } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTextDirectionListBox(vcl::Window *pParent, VclBuilder::stringmap &) - { - return new TextDirectionListBox(pParent); - } +VCL_BUILDER_FACTORY(TextDirectionListBox) } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 6f3805f7d8da..a8de05923261 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -29,6 +29,7 @@ #include <vcl/msgbox.hxx> #include <svx/svx3ditems.hxx> #include <svx/svddef.hxx> +#include <vcl/builderfactory.hxx> namespace chart { @@ -43,10 +44,7 @@ LightButton::LightButton( vcl::Window* pParent) SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLightButton(vcl::Window *pParent, VclBuilder::stringmap &) -{ - return new LightButton(pParent); -} +VCL_BUILDER_FACTORY(LightButton) void LightButton::switchLightOn(bool bOn) { diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index 54ecfe64ea79..55eb08494239 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -18,6 +18,7 @@ */ #include <vcl/layout.hxx> +#include <vcl/builderfactory.hxx> #include "tp_DataSourceControls.hxx" using namespace ::com::sun::star; @@ -35,7 +36,7 @@ SeriesListBox::SeriesListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) {} -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSeriesListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) +VCL_BUILDER_DECL_FACTORY(SeriesListBox) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); |