diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:14:40 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:14:40 +0000 |
| commit | e7377f827890492781c9d9dc7a7463055968e174 (patch) | |
| tree | d6a247b0449e11c9188f0ee53aecc1577d478f29 /vcl/source/app/svmain.cxx | |
| parent | 2858bdbf396a5487ddc98746a47673e6d62567d8 (diff) | |
INTEGRATION: CWS warnings01 (1.57.14); FILE MERGED
2006/05/23 19:29:55 sb 1.57.14.5: RESYNC: (1.58-1.60); FILE MERGED
2006/04/07 18:47:01 sb 1.57.14.4: RESYNC: (1.57-1.58); FILE MERGED
2005/11/04 16:49:33 pl 1.57.14.3: #i55991# removed warnings for linux/solaris
2005/11/02 12:18:55 pl 1.57.14.2: #i55991# removed warnings for solaris platform
2005/10/21 17:31:07 pl 1.57.14.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'vcl/source/app/svmain.cxx')
| -rw-r--r-- | vcl/source/app/svmain.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index f96545ebb3a0..33dcca29218c 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svmain.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: vg $ $Date: 2006-05-18 10:08:33 $ + * last change: $Author: hr $ $Date: 2006-06-19 19:14:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -177,24 +177,24 @@ public: USHORT nVCLException = 0; // UAE - if ( (pInfo->Signal == TSignal_AccessViolation) || - (pInfo->Signal == TSignal_IntegerDivideByZero) || - (pInfo->Signal == TSignal_FloatDivideByZero) || - (pInfo->Signal == TSignal_DebugBreak) ) + if ( (pInfo->Signal == osl_Signal_AccessViolation) || + (pInfo->Signal == osl_Signal_IntegerDivideByZero) || + (pInfo->Signal == osl_Signal_FloatDivideByZero) || + (pInfo->Signal == osl_Signal_DebugBreak) ) nVCLException = EXC_SYSTEM; // RC - if ((pInfo->Signal == TSignal_SignalUser) && + if ((pInfo->Signal == osl_Signal_User) && (pInfo->UserSignal == OSL_SIGNAL_USER_RESOURCEFAILURE) ) nVCLException = EXC_RSCNOTLOADED; // DISPLAY-Unix - if ((pInfo->Signal == TSignal_SignalUser) && + if ((pInfo->Signal == osl_Signal_User) && (pInfo->UserSignal == OSL_SIGNAL_USER_X11SUBSYSTEMERROR) ) nVCLException = EXC_DISPLAY; // Remote-Client - if ((pInfo->Signal == TSignal_SignalUser) && + if ((pInfo->Signal == osl_Signal_User) && (pInfo->UserSignal == OSL_SIGNAL_USER_RVPCONNECTIONERROR) ) nVCLException = EXC_REMOTE; @@ -379,7 +379,7 @@ void DeInitVCL() if ( pSVData->maAppData.mpIdleMgr ) delete pSVData->maAppData.mpIdleMgr; - ImplDeInitTimer(); + Timer::ImplDeInitTimer(); if ( pSVData->maWinData.mpMsgBoxImgList ) { @@ -551,12 +551,15 @@ static unsigned __stdcall _threadmain( void *pArgs ) } #else static oslThread hThreadID = 0; +extern "C" +{ static void SAL_CALL MainWorkerFunction( void* pArgs ) { ((WorkerThreadData*)pArgs)->pWorker( ((WorkerThreadData*)pArgs)->pThreadData ); delete (WorkerThreadData*)pArgs; hThreadID = 0; } +} // extern "C" #endif void CreateMainLoopThread( oslWorkerFunction pWorker, void * pThreadData ) |