diff options
| author | Chris Sherlock <chris.sherlock@collabora.com> | 2015-02-12 14:10:24 +1100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-02-17 11:34:20 +0100 |
| commit | 5d05f7ed8582193c39e29b7dc16767fb850e9f28 (patch) | |
| tree | 79b25898b74c25ca943018f725c72c2773f24419 /forms/source/component/ImageButton.cxx | |
| parent | abd9ca08df895a4ce6976554a46751dd469125f7 (diff) | |
forms: use constructor feature for form modules
Change-Id: I8f1588cbd338e2f8b5bc6047d84b17c697a7d2d3
Diffstat (limited to 'forms/source/component/ImageButton.cxx')
| -rw-r--r-- | forms/source/component/ImageButton.cxx | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 936c69194f7e..c9a0b5fd58fa 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -27,6 +27,7 @@ namespace frm { + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; @@ -40,11 +41,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; // OImageButtonModel -InterfaceRef SAL_CALL OImageButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) -{ - return *(new OImageButtonModel( comphelper::getComponentContext(_rxFactory) )); -} - OImageButtonModel::OImageButtonModel(const Reference<XComponentContext>& _rxFactory) :OClickableImageBaseModel( _rxFactory, VCL_CONTROLMODEL_IMAGEBUTTON, FRM_SUN_CONTROL_IMAGEBUTTON ) // use the old control name for compytibility reasons @@ -145,11 +141,6 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t } // OImageButtonControl -InterfaceRef SAL_CALL OImageButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) -{ - return *(new OImageButtonControl( comphelper::getComponentContext(_rxFactory) )); -} - Sequence<Type> OImageButtonControl::_getTypes() { static Sequence<Type> aTypes; @@ -229,4 +220,18 @@ void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) thr } // namespace frm +extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL +com_sun_star_form_OImageButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component, + ::com::sun::star::uno::Sequence<css::uno::Any> const &) +{ + return cppu::acquire(new frm::OImageButtonModel(component)); +} + +extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL +com_sun_star_form_OImageButtonControl_get_implementation(::com::sun::star::uno::XComponentContext* component, + ::com::sun::star::uno::Sequence<css::uno::Any> const &) +{ + return cppu::acquire(new frm::OImageButtonControl(component)); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |