diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /vcl/win/source/app/salshl.cxx | |
parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) |
rebase to DEV300_m100
Diffstat (limited to 'vcl/win/source/app/salshl.cxx')
-rwxr-xr-x | vcl/win/source/app/salshl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index f9df1b0be783..427f2092a0dc 100755 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -44,15 +44,15 @@ extern "C" { #ifdef __MINGW32__ -BOOL WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) +sal_Bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) #else #ifdef ICC int _CRT_init(void); #else -WIN_BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ); +BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ); #endif -WIN_BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) +BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) #endif { // Unsere DLL-Initialisierung @@ -103,7 +103,7 @@ HBITMAP ImplLoadSalBitmap( int nId ) // ----------------------------------------------------------------------- -BOOL ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) +sal_Bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) { DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" ); |