diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-06-03 22:53:53 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-06-04 08:30:24 +0200 |
| commit | 2091d5a4d37961969b270590a6906260415884cb (patch) | |
| tree | 7924a6040e62b426ef2936617775094a3571d91b /forms | |
| parent | f634cda2a26aba91277738f2c6f09405a2bf915c (diff) | |
forms: expand DECLARE_DEFAULT_DTOR
Change-Id: I52b091402ec23f9c5eb87ae2212cc5b4986c6435
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/refvaluecomponent.hxx | 2 | ||||
| -rw-r--r-- | forms/source/inc/FormComponent.hxx | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index 09c42c92f7aa..7afdd98aa7c6 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -57,7 +57,7 @@ namespace frm bool _bSupportNoCheckRefValue = false ); DECLARE_DEFAULT_CLONE_CTOR( OReferenceValueComponent ) - DECLARE_DEFAULT_DTOR( OReferenceValueComponent ); + virtual ~OReferenceValueComponent(); // OPropertySet and friends virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index abd4b024e8bf..f63e9da49508 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -523,11 +523,6 @@ public: getInstanceMutex() { return m_aMutex; } }; - -// simple destructor -#define DECLARE_DEFAULT_DTOR( classname ) \ - virtual ~classname() - // constructor for cloning a class #define DECLARE_DEFAULT_CLONE_CTOR( classname ) \ classname( \ @@ -543,7 +538,7 @@ public: const OUString& _rDefault \ ); \ DECLARE_DEFAULT_CLONE_CTOR( classname ) \ - DECLARE_DEFAULT_DTOR( classname ) \ + virtual ~classname() \ // all xtors for an inner class of the object hierarchy which is *bound* #define DECLARE_DEFAULT_BOUND_XTOR( classname ) \ @@ -555,7 +550,7 @@ public: const bool _bSupportsValidation \ ); \ DECLARE_DEFAULT_CLONE_CTOR( classname ) \ - DECLARE_DEFAULT_DTOR( classname ) \ + virtual ~classname() \ // all xtors for a leas class of the object hierarchy #define DECLARE_DEFAULT_LEAF_XTOR( classname ) \ @@ -566,7 +561,7 @@ public: const classname* _pOriginal, \ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory \ ); \ - DECLARE_DEFAULT_DTOR( classname ) \ + virtual ~classname() \ // XCloneable |