diff options
author | Noel Grandin <noel@peralex.com> | 2013-03-19 13:08:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-03-20 07:32:53 +0200 |
commit | a066525b42a1ab8dc60e10a5d62819c259904f32 (patch) | |
tree | 0c21130ff82a482ab80de0fcc3c73be0125d06f5 /extensions/source/dbpilots | |
parent | 6999a50efaaf802ccd4c7eb7957af17cc32602be (diff) |
fdo#46808, Convert a bunch of comphelper::ComponentContext stuff
.. to Reference<XComponentContext>
mostly in the dbaccess module, but it also affected some other
modules.
Change-Id: I09b3f6fe7a9b33498b11d98b5521b5aeeb8882be
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r-- | extensions/source/dbpilots/unoautopilot.hxx | 3 | ||||
-rw-r--r-- | extensions/source/dbpilots/unoautopilot.inl | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 7b5fdc75564f..fc75e21b509a 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -21,6 +21,7 @@ #define _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_ #include <svtools/genericunodialog.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/proparrhlp.hxx> #include "componentmodule.hxx" #include <cppuhelper/typeprovider.hxx> @@ -55,7 +56,7 @@ namespace dbp ,public ::comphelper::OPropertyArrayUsageHelper< OUnoAutoPilot< TYPE, SERVICEINFO > > ,public OModuleResourceClient { - OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index 9375243425bd..0ab9dc2219f4 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -23,7 +23,7 @@ //= OUnoAutoPilot //===================================================================== template <class TYPE, class SERVICEINFO> -OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) +OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) :OUnoAutoPilot_Base(_rxORB) { } @@ -40,7 +40,7 @@ template <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO> ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) { - return *(new OUnoAutoPilot<TYPE, SERVICEINFO>(_rxFactory)); + return *(new OUnoAutoPilot<TYPE, SERVICEINFO>( comphelper::getComponentContext(_rxFactory) )); } //--------------------------------------------------------------------- @@ -99,7 +99,7 @@ template <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO> Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent) { - return new TYPE(_pParent, m_xObjectModel, m_aContext.getUNOContext()); + return new TYPE(_pParent, m_xObjectModel, m_aContext); } //-------------------------------------------------------------------------- |