diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 16:28:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 16:28:22 +0100 |
| commit | 667910530deb61563d4812db0995da94e25220e5 (patch) | |
| tree | 9e19a2c89c1b9ee8ae3610096d295e99873a3b5c /include/vcl/builderfactory.hxx | |
| parent | 7ac254048a5698e046bbb7deccd171cb3777af61 (diff) | |
Revert "Switch VclBuilder constructors to use VclPtr."
Behaves oddly; not ready yet.
This reverts commit 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c.
Change-Id: I30d746eac29d1dbe78d3072b10d2e22c051e3f4e
Diffstat (limited to 'include/vcl/builderfactory.hxx')
| -rw-r--r-- | include/vcl/builderfactory.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx index 473e4516d227..b50a557f4065 100644 --- a/include/vcl/builderfactory.hxx +++ b/include/vcl/builderfactory.hxx @@ -10,25 +10,24 @@ #ifndef INCLUDED_VCL_BUILDER_FACTORY_HXX #define INCLUDED_VCL_BUILDER_FACTORY_HXX -#include <vcl/vclptr.hxx> #include <vcl/builder.hxx> #define VCL_BUILDER_DECL_FACTORY(typeName) \ - extern "C" SAL_DLLPUBLIC_EXPORT VclPtr<vcl::Window> SAL_CALL \ + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL \ make##typeName(vcl::Window *pParent, VclBuilder::stringmap &rMap) #define VCL_BUILDER_FACTORY(typeName) \ VCL_BUILDER_DECL_FACTORY(typeName) \ { \ (void)rMap; \ - return VclPtr<typeName>::Create(pParent); \ + return new typeName(pParent); \ } #define VCL_BUILDER_FACTORY_ARGS(typeName,arg1) \ VCL_BUILDER_DECL_FACTORY(typeName) \ { \ (void)rMap; \ - return VclPtr<typeName>::Create(pParent,arg1); \ + return new typeName(pParent,arg1); \ } #endif |