diff options
| author | Hennes Rohling <hro@openoffice.org> | 2001-12-04 12:42:27 +0000 |
|---|---|---|
| committer | Hennes Rohling <hro@openoffice.org> | 2001-12-04 12:42:27 +0000 |
| commit | c949954a13713472d474aa92dbd00b338d211e48 (patch) | |
| tree | f7fc98dc7fa19f09275ec055157231bf182e6ed5 | |
| parent | 91aee1476f0a7f217e5e400edc3ac23f33454d62 (diff) | |
#95524# Create SAL instance before initializing the app because the init code perhaps uses the SAL instance
| -rw-r--r-- | vcl/source/app/svmain.cxx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 4f94ef3fe1fd..2f04e79833e4 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svmain.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: ssa $ $Date: 2001-10-18 12:18:49 $ + * last change: $Author: hro $ $Date: 2001-12-04 13:42:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -346,6 +346,16 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM pSVData->mpUserInfo = new UserOnPrintServer; #endif + // Sal initialisieren +#ifndef REMOTE_APPSERVER + RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ ::CreateSalInstance" ); + pSVData->mpDefInst = CreateSalInstance(); + if ( !pSVData->mpDefInst ) + return FALSE; + RTL_LOGFILE_CONTEXT_TRACE( aLog, "} ::CreateSalInstance" ); +#endif + + // Initialize application instance (should be done after initialization of VCL SAL part) if( pSVData->mpApp ) // call init to initialize application class // soffice/sfx implementation creates the global service manager @@ -370,15 +380,6 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM #endif - // Sal initialisieren -#ifndef REMOTE_APPSERVER - RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ ::CreateSalInstance" ); - pSVData->mpDefInst = CreateSalInstance(); - if ( !pSVData->mpDefInst ) - return FALSE; - RTL_LOGFILE_CONTEXT_TRACE( aLog, "} ::CreateSalInstance" ); -#endif - // Den AppFileName gleich holen und absolut machen, bevor das // WorkingDirectory sich aendert... aStartInfo.getExecutableFile( aExeFileName ); |