diff options
author | Noel Grandin <noel@peralex.com> | 2013-06-03 08:34:09 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-06-03 10:00:03 +0200 |
commit | d209e133191853f12557d879d1dcda7a0309dac6 (patch) | |
tree | f49624949123d6ae5486b817daafaf7fb7778a4b /forms/source/component/ImageButton.cxx | |
parent | fdo#46808, Convert ComponentContext in connectivity,extension.. (diff) | |
download | core-d209e133191853f12557d879d1dcda7a0309dac6.tar.gz core-d209e133191853f12557d879d1dcda7a0309dac6.zip |
fdo#46808, Convert comphelper::ComponentContext in forms module
Change-Id: I8a9913d964633381f00c0a4885cc655805fa1974
Diffstat (limited to 'forms/source/component/ImageButton.cxx')
-rw-r--r-- | forms/source/component/ImageButton.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index e5f66eff329a..9507ebe94a5a 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -23,6 +23,7 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <comphelper/basicio.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/awt/MouseButton.hpp> //......................................................................... @@ -48,11 +49,11 @@ DBG_NAME(OImageButtonModel) //------------------------------------------------------------------ InterfaceRef SAL_CALL OImageButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { - return *(new OImageButtonModel(_rxFactory)); + return *(new OImageButtonModel( comphelper::getComponentContext(_rxFactory) )); } //------------------------------------------------------------------ -OImageButtonModel::OImageButtonModel(const Reference<XMultiServiceFactory>& _rxFactory) +OImageButtonModel::OImageButtonModel(const Reference<XComponentContext>& _rxFactory) :OClickableImageBaseModel( _rxFactory, VCL_CONTROLMODEL_IMAGEBUTTON, FRM_SUN_CONTROL_IMAGEBUTTON ) // use the old control name for compytibility reasons { @@ -61,7 +62,7 @@ OImageButtonModel::OImageButtonModel(const Reference<XMultiServiceFactory>& _rxF } //------------------------------------------------------------------ -OImageButtonModel::OImageButtonModel( const OImageButtonModel* _pOriginal, const Reference<XMultiServiceFactory>& _rxFactory) +OImageButtonModel::OImageButtonModel( const OImageButtonModel* _pOriginal, const Reference<XComponentContext>& _rxFactory) :OClickableImageBaseModel( _pOriginal, _rxFactory ) { DBG_CTOR(OImageButtonModel, NULL); @@ -168,7 +169,7 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t //------------------------------------------------------------------ InterfaceRef SAL_CALL OImageButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { - return *(new OImageButtonControl(_rxFactory)); + return *(new OImageButtonControl( comphelper::getComponentContext(_rxFactory) )); } //------------------------------------------------------------------------------ @@ -192,7 +193,7 @@ StringSequence OImageButtonControl::getSupportedServiceNames() throw() } //------------------------------------------------------------------------------ -OImageButtonControl::OImageButtonControl(const Reference<XMultiServiceFactory>& _rxFactory) +OImageButtonControl::OImageButtonControl(const Reference<XComponentContext>& _rxFactory) :OClickableImageBaseControl(_rxFactory, VCL_CONTROL_IMAGEBUTTON) { increment(m_refCount); |