summaryrefslogtreecommitdiff
path: root/sfx2/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-03-19 13:08:47 +0200
committerNoel Grandin <noel@peralex.com>2013-03-20 07:32:53 +0200
commita066525b42a1ab8dc60e10a5d62819c259904f32 (patch)
tree0c21130ff82a482ab80de0fcc3c73be0125d06f5 /sfx2/inc
parent6999a50efaaf802ccd4c7eb7957af17cc32602be (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 'sfx2/inc')
-rw-r--r--sfx2/inc/frmload.hxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index fe5874ab2758..35f106ee8b2e 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -31,7 +31,6 @@
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -40,7 +39,6 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/factory.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/namedvaluecollection.hxx>
class SfxFilter;
@@ -48,10 +46,10 @@ class SfxFilterMatcher;
class SAL_DLLPRIVATE SfxFrameLoader_Impl : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XSynchronousFrameLoader, ::com::sun::star::lang::XServiceInfo >
{
- ::comphelper::ComponentContext m_aContext;
+ ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext > m_aContext;
public:
- SfxFrameLoader_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
+ SfxFrameLoader_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext >& _rxContext );
SFX_DECL_XSERVICEINFO