diff options
Diffstat (limited to 'sd/source/ui/animations')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index d390643f38d5..7f73b5c89bf3 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -24,7 +24,7 @@ #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> -#include <vcl/builder.hxx> +#include <vcl/builderfactory.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> @@ -90,10 +90,7 @@ CategoryListBox::CategoryListBox( vcl::Window* pParent ) SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCategoryListBox(vcl::Window *pParent, VclBuilder::stringmap &) -{ - return new CategoryListBox( pParent ); -} +VCL_BUILDER_FACTORY(CategoryListBox) CategoryListBox::~CategoryListBox() { diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index e9c8dad5af93..461272eb42a0 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -50,6 +50,7 @@ #include <vcl/combobox.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> +#include <vcl/builderfactory.hxx> #include <svtools/ctrlbox.hxx> #include <svtools/ctrltool.hxx> @@ -2282,10 +2283,7 @@ PropertyControl::PropertyControl( vcl::Window* pParent ) { } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePropertyControl( vcl::Window *pParent ) -{ - return new PropertyControl( pParent ); -} +VCL_BUILDER_FACTORY(PropertyControl) PropertyControl::~PropertyControl() { diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 27cabc952321..d840f0ab4db1 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -34,6 +34,7 @@ #include "CustomAnimationPreset.hxx" #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/builderfactory.hxx> #include "sdresid.hxx" @@ -433,10 +434,7 @@ CustomAnimationList::CustomAnimationList( vcl::Window* pParent ) SetNodeDefaultImages(); } -extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCustomAnimationList( vcl::Window *pParent ) -{ - return new CustomAnimationList( pParent ); -} +VCL_BUILDER_FACTORY(CustomAnimationList) const Image& CustomAnimationList::getImage( sal_uInt16 nId ) { |