cppcheck: redundantAssignment

Change-Id: Ife6a840c606b1c8673d814491cea3c4dad796c4e
This commit is contained in:
Julien Nabet
2013-09-27 23:21:12 +02:00
parent bf5db198e1
commit ed0b3988db

View File

@@ -1614,14 +1614,13 @@ void Application::AddToRecentDocumentList(const OUString& rFileUrl, const OUStri
bool InitAccessBridge( bool bShowCancel, bool &rCancelled ) bool InitAccessBridge( bool bShowCancel, bool &rCancelled )
{ {
bool bRet = true;
// Disable Java bridge on UNIX // Disable Java bridge on UNIX
#if defined UNX #if defined UNX
(void) bShowCancel; // unused (void) bShowCancel; // unused
(void) rCancelled; // unused (void) rCancelled; // unused
return true;
#else #else
bRet = ImplInitAccessBridge( bShowCancel, rCancelled ); bool bRet = ImplInitAccessBridge( bShowCancel, rCancelled );
if( !bRet && bShowCancel && !rCancelled ) if( !bRet && bShowCancel && !rCancelled )
{ {
@@ -1632,9 +1631,8 @@ bool InitAccessBridge( bool bShowCancel, bool &rCancelled )
aSettings.SetMiscSettings( aMisc ); aSettings.SetMiscSettings( aMisc );
Application::SetSettings( aSettings ); Application::SetSettings( aSettings );
} }
#endif // !UNX
return bRet; return bRet;
#endif // !UNX
} }
// MT: AppEvent was in oldsv.cxx, but is still needed... // MT: AppEvent was in oldsv.cxx, but is still needed...