summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2001-08-02 11:21:35 +0000
committerJoachim Lingner <jl@openoffice.org>2001-08-02 11:21:35 +0000
commit080f28c8a7b3cf614a317ec5fe632e02bdc7ab95 (patch)
tree612f32fb0b4f38dcf25c5083b9d0b7a419e9be10 /desktop/source
parent086d00ad4d4bce674113b76b6ec576dcf26a508b (diff)
#89052# OleApplicationRegistration is now called from within Desktop::OpenClients_Impl
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/app/app.cxx14
-rw-r--r--desktop/source/app/appinit.cxx11
2 files changed, 14 insertions, 11 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 873fbe558ef8..e7f8a27cfa0d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: app.cxx,v $
*
- * $Revision: 1.34 $
+ * $Revision: 1.35 $
*
- * last change: $Author: fs $ $Date: 2001-08-01 12:16:42 $
+ * last change: $Author: jl $ $Date: 2001-08-02 12:21:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -908,8 +908,18 @@ IMPL_LINK( Desktop, OpenClients_Impl, void*, pvoid )
CheckFirstRun( );
+ EnableOleAutomation();
return 0;
}
+// Registers a COM class factory of the service manager with the windows operating system.
+void Desktop::EnableOleAutomation()
+{
+ RTL_LOGFILE_CONTEXT( aLog, "desktop (jl97489) ::Desktop::EnableOleAutomation" );
+#ifdef WNT
+ Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory();
+ xSMgr->createInstance(DEFINE_CONST_UNICODE("com.sun.star.bridge.OleApplicationRegistration"));
+#endif
+}
void Desktop::OpenClients()
{
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index d128b46f6d8d..732d50afc828 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: appinit.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: kr $ $Date: 2001-07-25 14:11:11 $
+ * last change: $Author: jl $ $Date: 2001-08-02 12:21:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -303,13 +303,6 @@ void registerServices( Reference< XMultiServiceFactory >& xSMgr )
Sequence<Any>( &aAny, 1 ) );
}
- // try to start OLE registration service.
- // on success (WIN32 only) this process will work
- // as OLE automation server for standard UNO objects.
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ createInstance com.sun.star.bridge.OleApplicationRegistration" );
- xSMgr->createInstance(DEFINE_CONST_UNICODE("com.sun.star.bridge.OleApplicationRegistration"));
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "} createInstance com.sun.star.bridge.OleApplicationRegistration" );
-
::rtl::OUString aPortalConnect;
sal_Bool bServer = pCmdLine->IsServer();