diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 17:04:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 17:11:10 +0100 |
| commit | b5423ef42e18caac3ceb5d880ba1b6a1737e155c (patch) | |
| tree | e4954c19e774c597171ed41f20a3f99306cf81aa /vcl | |
| parent | 232c6f1309bb73cc6516c58da749f64ce3668932 (diff) | |
WaE: misc. windows related fixes
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/app/salinfo.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/app/salshl.cxx | 3 | ||||
| -rw-r--r-- | vcl/win/source/window/salobj.cxx | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 0b4f7a91d9bd..1795d5a34496 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -1280,14 +1280,14 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) { case REG_SZ: RegSetValueEx(hkey, "SupportAssistiveTechnology", - NULL, dwType, + 0, dwType, bEnable ? (sal_uInt8 *) "true" : (sal_uInt8 *) "false", bEnable ? sizeof("true") : sizeof("false")); break; case REG_DWORD: ((DWORD *) Data)[0] = bEnable ? 1 : 0; RegSetValueEx(hkey, "SupportAssistiveTechnology", - NULL, dwType, Data, sizeof(DWORD)); + 0, dwType, Data, sizeof(DWORD)); break; default: // Unsupported registry type diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 03d1810b081a..ae10ae4c270e 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -156,8 +156,8 @@ bool WinSalSystem::initMonitors() // append monitor numbers to name strings boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); - unsigned int nMonitors = m_aMonitors.size(); - for( unsigned int i = 0; i < nMonitors; i++ ) + unsigned int nMonitorCount = m_aMonitors.size(); + for( unsigned int i = 0; i < nMonitorCount; i++ ) { const rtl::OUString& rDev( m_aMonitors[i].m_aName ); if( aDeviceStringCount[ rDev ] > 1 ) diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index caebe9ca5b18..ccc643244005 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -67,8 +67,9 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) if ( !_CRT_INIT( hInst, nReason, pReserved ) ) #endif return 0; +#else + (void)pReserved; #endif - return 1; } diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index f79ad89fff45..0ee631d27d84 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -116,11 +116,9 @@ sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg ) { // look for the first SalObject in the parent hierarchy HWND hWin = rMsg.hwnd; - HWND hLastOLEWindow = hWin; WinSalObject* pSalObj = NULL; do { - hLastOLEWindow = hWin; hWin = ::GetParent( hWin ); if ( hWin ) { |