diff options
| -rw-r--r-- | vcl/source/app/svmain.cxx | 17 | ||||
| -rw-r--r-- | vcl/workben/svdem.cxx | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 2911273a1dac..71e9c3c49bc6 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svmain.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: cp $ $Date: 2001-02-23 18:02:50 $ + * last change: $Author: mm $ $Date: 2001-02-23 18:07:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,6 +158,10 @@ #include <comphelper/processfactory.hxx> #endif +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif + #ifdef REMOTE_APPSERVER #include <config.hxx> #include <ooffice.hxx> @@ -297,7 +301,7 @@ public: void Main(){}; }; -BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) +BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) { if( pExceptionHandler != NULL ) return FALSE; @@ -305,8 +309,8 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM if( !ImplGetSVData()->mpApp ) { pOwnSvApp = new Application_Impl(); - InitSalMain(); } + InitSalMain(); #ifdef WNT // remember data, copied from WinMain @@ -330,6 +334,9 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM // SV bei den Tools anmelden InitTools(); + //DBG_ASSERT( !pSVData->maAppData.mxMSF.is(), "VCL service factory already set" ) + //pSVData->maAppData.mxMSF = rSMgr; + // Main-Thread-Id merken pSVData->mnMainThreadId = ::vos::OThread::getCurrentIdentifier(); @@ -695,9 +702,9 @@ void DeInitVCL() DeInitTools(); + DeInitSalMain(); if( pOwnSvApp ) { - DeInitSalMain(); delete pOwnSvApp; pOwnSvApp = NULL; } diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index 7d318e6b6b81..c7f8511920e6 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mm $ $Date: 2001-02-22 16:03:13 $ + * last change: $Author: mm $ $Date: 2001-02-23 18:08:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ SAL_IMPLEMENT_MAIN() { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMS; InitVCL( xMS ); - Main(); + ::Main(); DeInitVCL(); return 0; } |