diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
| commit | fd0649408ac52ec0c6a443c5716d50c9243bca7e (patch) | |
| tree | 5c5472ebd37157ec38bef497ddad7c8fa4acfbba /sal/osl/w32/diagnose.c | |
| parent | ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 (diff) | |
| parent | 1247c8b2350734c4f16bbc15404c3c7d56bf8523 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'sal/osl/w32/diagnose.c')
| -rwxr-xr-x | sal/osl/w32/diagnose.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/osl/w32/diagnose.c b/sal/osl/w32/diagnose.c index 0e1f1d864..93240e084 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"; @@ -111,6 +111,7 @@ sal_Bool SAL_CALL osl_assertFailedLine(const sal_Char* pszFileName, sal_Int32 nL if ( !getenv( "DISABLE_SAL_DBGBOX" ) ) { TCHAR szBoxMessage[1024]; + int nCode; /* active popup window for the current thread */ hWndParent = GetActiveWindow(); @@ -155,8 +156,6 @@ sal_Int32 SAL_CALL osl_reportError(sal_uInt32 nType, const sal_Char* pszMessage) HWND hWndParent = GetActiveWindow(); 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; @@ -165,7 +164,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: */ |