diff options
Diffstat (limited to 'sal/osl/w32/diagnose.c')
| -rwxr-xr-x | sal/osl/w32/diagnose.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sal/osl/w32/diagnose.c b/sal/osl/w32/diagnose.c index 9c75e4502743..e25c60e8c886 100755 --- a/sal/osl/w32/diagnose.c +++ b/sal/osl/w32/diagnose.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,7 +89,6 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL #else HWND hWndParent; UINT nFlags; - int nCode; /* get app name or NULL if unknown (don't call assert) */ LPCSTR lpszAppName = "Error"; @@ -108,6 +108,7 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL else if ( !getenv( "DISABLE_SAL_DBGBOX" ) ) { TCHAR szBoxMessage[1024]; + int nCode; /* active popup window for the current thread */ hWndParent = GetActiveWindow(); @@ -137,7 +138,7 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL return sal_True; /* will cause oslDebugBreak */ } #endif /* NO_DEBUG_CRT */ - return sal_False; /* not shure, not care */ + return sal_False; /* not sure, don't care */ } sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage) @@ -150,8 +151,6 @@ sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage) if (hWndParent != NULL) hWndParent = GetLastActivePopup(hWndParent); - nType = nType; /* avoid warnings */ - /* set message box flags */ nFlags = MB_TASKMODAL | MB_ICONERROR | MB_YESNOCANCEL | MB_DEFBUTTON2 | MB_SETFOREGROUND; if (hWndParent == NULL) @@ -159,7 +158,8 @@ sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage) // display the assert nDisposition = MessageBox(hWndParent, pszMessage, "Exception!", nFlags); - + (void)nType; //unused, but part of public API/ABI return nDisposition; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |