fpicker/source/win32/filepicker/SolarMutex.cxx | 1 -
fpicker/source/win32/filepicker/asynceventnotifier.cxx | 5 ++---
vcl/source/app/settings.cxx | 4 ++--
vcl/win/source/app/salinfo.cxx | 4 ++--
vcl/win/source/app/salshl.cxx | 3 ++-
vcl/win/source/window/salobj.cxx | 2 --
6 files changed, 8 insertions(+), 11 deletions(-)
New commits:
commit 6d5de13f1a91029162aa614d37e82acf73cf51fc
Author: Michael Meeks <michael.me...@suse.com>
Date: Tue Oct 25 17:04:48 2011 +0100
WaE: misc. windows related fixes
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx
b/fpicker/source/win32/filepicker/SolarMutex.cxx
index b11d35a..ba3d0ed 100644
--- a/fpicker/source/win32/filepicker/SolarMutex.cxx
+++ b/fpicker/source/win32/filepicker/SolarMutex.cxx
@@ -36,7 +36,6 @@
int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId)
{
int nAcquireCount = 0;
- osl::SolarMutex& rSolarMutex = Application::GetSolarMutex();
oslThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier();
if ( nMainThreadId == nThreadId )
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index fac8480..4cfbe94 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -158,9 +158,8 @@ bool SAL_CALL CAsyncEventNotifier::startup(bool
bCreateSuspended)
void SAL_CALL CAsyncEventNotifier::shutdown()
{
- unsigned nThreadId = GetCurrentThreadId();
-
- OSL_PRECOND(nThreadId != m_ThreadId, "Method called in wrong thread
context!");
+ OSL_PRECOND(GetCurrentThreadId() != m_ThreadId,
+ "Method called in wrong thread context!");
osl::ResettableMutexGuard aGuard(m_Mutex);
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index eec8ba5..535d380 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1285,14 +1285,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 03d1810..ae10ae4 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 caebe9c..ccc6432 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 f79ad89..0ee631d 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 )
{
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
