Kaydet (Commit) c8eb6910 authored tarafından jailletc36's avatar jailletc36 Kaydeden (comit) Radek Doulík

cppCheck: Various clean-up

mailconfigpapge: shouldn't it be a logical AND instead of a bit-wise operation ?
HeaderFooterWin, drwtxtsh, formatclipboard, wview:	redundant assignment
fldref: unused variable

Change-Id: I5016c12527a8811676ff10f07f7be9e855c66814
Signed-off-by: 's avatarjailletc36 <christophe.jaillet@wanadoo.fr>
Reviewed-on: https://gerrit.libreoffice.org/996Reviewed-by: 's avatarRadek Doulík <rodo@novell.com>
Tested-by: 's avatarRadek Doulík <rodo@novell.com>
üst f3acd723
...@@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl) ...@@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl)
{ {
sal_Bool bSeparate = m_aSeparateAuthenticationRB.IsChecked(); sal_Bool bSeparate = m_aSeparateAuthenticationRB.IsChecked();
sal_Bool bIsEnabled = m_aSeparateAuthenticationRB.IsEnabled(); sal_Bool bIsEnabled = m_aSeparateAuthenticationRB.IsEnabled();
sal_Bool bNotSeparate = !bSeparate & bIsEnabled; sal_Bool bNotSeparate = !bSeparate && bIsEnabled;
bSeparate &= bIsEnabled; bSeparate &= bIsEnabled;
m_aOutgoingServerFT.Enable(bSeparate); m_aOutgoingServerFT.Enable(bSeparate);
......
...@@ -276,8 +276,6 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) ...@@ -276,8 +276,6 @@ void SwHeaderFooterWin::Paint( const Rectangle& )
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
if ( rSettings.GetHighContrastMode() ) if ( rSettings.GetHighContrastMode() )
{ {
aLineColor = rSettings.GetDialogTextColor().getBColor();
aFillColor = rSettings.GetDialogColor( ).getBColor(); aFillColor = rSettings.GetDialogColor( ).getBColor();
aLineColor = rSettings.GetDialogTextColor( ).getBColor(); aLineColor = rSettings.GetDialogTextColor( ).getBColor();
......
...@@ -116,11 +116,7 @@ void SwFldRefPage::SaveSelectedTxtNode() ...@@ -116,11 +116,7 @@ void SwFldRefPage::SaveSelectedTxtNode()
if ( pEntry ) if ( pEntry )
{ {
const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel());
SwWrtShell *pSh = GetWrtShell();
if ( !pSh )
{
pSh = ::GetActiveWrtShell();
}
if ( nTypeId == REFFLDFLAG_HEADING ) if ( nTypeId == REFFLDFLAG_HEADING )
{ {
mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pEntry->GetUserData())); mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pEntry->GetUserData()));
......
...@@ -837,7 +837,6 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) ...@@ -837,7 +837,6 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
SwWrtShell &rSh = GetShell(); SwWrtShell &rSh = GetShell();
pSdrView = rSh.GetDrawView(); pSdrView = rSh.GetDrawView();
SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner(); SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
pOutliner = pSdrView->GetTextEditOutliner();
return &pOutliner->GetUndoManager(); return &pOutliner->GetUndoManager();
} }
......
...@@ -160,7 +160,6 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh ) ...@@ -160,7 +160,6 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh )
const SfxPoolItem* pItem = 0; const SfxPoolItem* pItem = 0;
sal_Bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) || sal_Bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) ||
SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) ); SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) );
pItem = 0;
sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem );
const SfxPoolItem* pRowItem = 0, *pTableItem = 0; const SfxPoolItem* pRowItem = 0, *pTableItem = 0;
bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem ); bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem );
......
...@@ -197,7 +197,6 @@ void SwWebView::SelectShell() ...@@ -197,7 +197,6 @@ void SwWebView::SelectShell()
SetShell( new svx::ExtrusionBar( this ) ); SetShell( new svx::ExtrusionBar( this ) );
rDispatcher.Push( *GetCurShell() ); rDispatcher.Push( *GetCurShell() );
eShellMode = SHELL_MODE_DRAW;
SetShell( new svx::FontworkBar( this ) ); SetShell( new svx::FontworkBar( this ) );
rDispatcher.Push( *GetCurShell() ); rDispatcher.Push( *GetCurShell() );
......
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