diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/saldata.cxx | 3 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/animate.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/taskpanelist.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx index 7008011d4df8..1dff45e2aee5 100644 --- a/vcl/osx/saldata.cxx +++ b/vcl/osx/saldata.cxx @@ -71,8 +71,7 @@ SalData::~SalData() if( s_aAutoReleaseKey ) { // release the last pool - NSAutoreleasePool* pPool = nil; - pPool = reinterpret_cast<NSAutoreleasePool*>( osl_getThreadKeyData( s_aAutoReleaseKey ) ); + NSAutoreleasePool* pPool = reinterpret_cast<NSAutoreleasePool*>( osl_getThreadKeyData( s_aAutoReleaseKey ) ); if( pPool ) { osl_setThreadKeyData( s_aAutoReleaseKey, NULL ); diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 025d873c2f98..f900bfa949aa 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -323,10 +323,8 @@ static bool AddTempDevFont(const OUString& rFontFileURL) CFStringRef rFontPath = CFStringCreateWithCString(NULL, aCFileName.getStr(), kCFStringEncodingUTF8); CFURLRef rFontURL = CFURLCreateWithFileSystemPath(NULL, rFontPath, kCFURLPOSIXPathStyle, true); - bool success = false; - CFErrorRef error; - success = CTFontManagerRegisterFontsForURL(rFontURL, kCTFontManagerScopeProcess, &error); + bool success = CTFontManagerRegisterFontsForURL(rFontURL, kCTFontManagerScopeProcess, &error); if (!success) { CFRelease(error); diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 4dd37f8381e2..5578cf6ffb3f 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -733,11 +733,11 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation ) SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation ) { - Bitmap aBmp; - sal_uLong nStmPos = rIStm.Tell(); + Bitmap aBmp; + sal_uLong nStmPos; sal_uInt32 nAnimMagic1, nAnimMagic2; SvStreamEndian nOldFormat = rIStm.GetEndian(); - bool bReadAnimations = false; + bool bReadAnimations = false; rIStm.SetEndian( SvStreamEndian::LITTLE ); nStmPos = rIStm.Tell(); diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 9b4767e59430..cf2a0cb51520 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -161,7 +161,7 @@ bool TaskPaneList::HandleKeyEvent(const KeyEvent& rKeyEvent) bool bForward = !aKeyCode.IsShift(); if( aKeyCode.GetCode() == KEY_F6 && ! aKeyCode.IsMod2() ) // F6 { - bool bSplitterOnly = false; + bool bSplitterOnly; bool bFocusInList = false; bSplitterOnly = aKeyCode.IsMod1() && aKeyCode.IsShift(); diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 3fb511a810d0..eb39ad32725e 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -313,7 +313,7 @@ bool WinSalInstance::CheckYieldMutex() void SalData::initKeyCodeMap() { - UINT nKey = 0xffffffff; + UINT nKey; #define initKey( a, b )\ nKey = LOWORD( VkKeyScan( a ) );\ if( nKey < 0xffff )\ |