Kaydet (Commit) 9cdf7c8f authored tarafından Caolán McNamara's avatar Caolán McNamara

WaE: bResetSession set but unused

üst 3e0ff0ae
...@@ -519,7 +519,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) ...@@ -519,7 +519,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
{ {
const SfxPoolItem *pItem = 0; const SfxPoolItem *pItem = 0;
SfxItemPool &rPool = GetPool(); SfxItemPool &rPool = GetPool();
sal_Bool bResetSession = sal_False;
SvtSaveOptions aSaveOptions; SvtSaveOptions aSaveOptions;
SvtUndoOptions aUndoOptions; SvtUndoOptions aUndoOptions;
...@@ -735,45 +734,38 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) ...@@ -735,45 +734,38 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
{ {
DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected"); DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
aSecurityOptions.SetExecutePlugins( ( (const SfxBoolItem *)pItem )->GetValue() ); aSecurityOptions.SetExecutePlugins( ( (const SfxBoolItem *)pItem )->GetValue() );
bResetSession = sal_True;
} }
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), sal_True, &pItem)) if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), sal_True, &pItem))
{ {
DBG_ASSERT( pItem->ISA(SfxUInt16Item), "UInt16Item expected" ); DBG_ASSERT( pItem->ISA(SfxUInt16Item), "UInt16Item expected" );
aInetOptions.SetProxyType((SvtInetOptions::ProxyType)( (const SfxUInt16Item*)pItem )->GetValue()); aInetOptions.SetProxyType((SvtInetOptions::ProxyType)( (const SfxUInt16Item*)pItem )->GetValue());
bResetSession = sal_True;
} }
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), sal_True, &pItem ) ) if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), sal_True, &pItem ) )
{ {
DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" ); DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
aInetOptions.SetProxyHttpName( ((const SfxStringItem *)pItem)->GetValue() ); aInetOptions.SetProxyHttpName( ((const SfxStringItem *)pItem)->GetValue() );
bResetSession = sal_True;
} }
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), sal_True, &pItem ) ) if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), sal_True, &pItem ) )
{ {
DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" ); DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
aInetOptions.SetProxyHttpPort( ( (const SfxInt32Item*)pItem )->GetValue() ); aInetOptions.SetProxyHttpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
bResetSession = sal_True;
} }
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), sal_True, &pItem ) ) if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), sal_True, &pItem ) )
{ {
DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" ); DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
aInetOptions.SetProxyFtpName( ((const SfxStringItem *)pItem)->GetValue() ); aInetOptions.SetProxyFtpName( ((const SfxStringItem *)pItem)->GetValue() );
bResetSession = sal_True;
} }
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), sal_True, &pItem ) ) if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), sal_True, &pItem ) )
{ {
DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" ); DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
aInetOptions.SetProxyFtpPort( ( (const SfxInt32Item*)pItem )->GetValue() ); aInetOptions.SetProxyFtpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
bResetSession = sal_True;
} }
if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, sal_True, &pItem)) if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, sal_True, &pItem))
{ {
DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected"); DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
aInetOptions.SetProxyNoProxy(((const SfxStringItem *)pItem)->GetValue()); aInetOptions.SetProxyNoProxy(((const SfxStringItem *)pItem)->GetValue());
bResetSession = sal_True;
} }
// Secure-Referers // Secure-Referers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment