sw/README | 4 ++++ sw/source/ui/config/mailconfigpage.cxx | 2 +- sw/source/ui/docvw/HeaderFooterWin.cxx | 2 -- sw/source/ui/fldui/fldref.cxx | 6 +----- sw/source/ui/shells/drwtxtsh.cxx | 1 - sw/source/ui/uiview/formatclipboard.cxx | 1 - sw/source/ui/web/wview.cxx | 1 - tools/README | 8 +++++++- 8 files changed, 13 insertions(+), 12 deletions(-)
New commits: commit c8eb6910cd41901daf2f4192c0b3e583a20adc90 Author: jailletc36 <[email protected]> Date: Tue Nov 6 22:49:28 2012 +0100 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: jailletc36 <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/996 Reviewed-by: Radek DoulÃk <[email protected]> Tested-by: Radek DoulÃk <[email protected]> diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 430312c..197259a 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -548,7 +548,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl) { sal_Bool bSeparate = m_aSeparateAuthenticationRB.IsChecked(); sal_Bool bIsEnabled = m_aSeparateAuthenticationRB.IsEnabled(); - sal_Bool bNotSeparate = !bSeparate & bIsEnabled; + sal_Bool bNotSeparate = !bSeparate && bIsEnabled; bSeparate &= bIsEnabled; m_aOutgoingServerFT.Enable(bSeparate); diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 82c6638..25e2913 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -276,8 +276,6 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); if ( rSettings.GetHighContrastMode() ) { - aLineColor = rSettings.GetDialogTextColor().getBColor(); - aFillColor = rSettings.GetDialogColor( ).getBColor(); aLineColor = rSettings.GetDialogTextColor( ).getBColor(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 837c7d4..e00fb78 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -116,11 +116,7 @@ void SwFldRefPage::SaveSelectedTxtNode() if ( pEntry ) { const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - SwWrtShell *pSh = GetWrtShell(); - if ( !pSh ) - { - pSh = ::GetActiveWrtShell(); - } + if ( nTypeId == REFFLDFLAG_HEADING ) { mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pEntry->GetUserData())); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 82c6bee..fd5eb1a 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -837,7 +837,6 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) SwWrtShell &rSh = GetShell(); pSdrView = rSh.GetDrawView(); SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner(); - pOutliner = pSdrView->GetTextEditOutliner(); return &pOutliner->GetUndoManager(); } diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index dd6e653..f907754 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -160,7 +160,6 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh ) const SfxPoolItem* pItem = 0; sal_Bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) || SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) ); - pItem = 0; sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); const SfxPoolItem* pRowItem = 0, *pTableItem = 0; bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem ); diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index d6541a2..f9af40c 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -197,7 +197,6 @@ void SwWebView::SelectShell() SetShell( new svx::ExtrusionBar( this ) ); rDispatcher.Push( *GetCurShell() ); - eShellMode = SHELL_MODE_DRAW; SetShell( new svx::FontworkBar( this ) ); rDispatcher.Push( *GetCurShell() ); commit f3acd7232371fd67a80062a045a1a09e3c8d5ab9 Author: Thorsten Behrens <[email protected]> Date: Wed Nov 7 16:55:51 2012 +0100 Documenting results from src code archeology. Kudos to mst for remembering the Writer core comments from Juergen Pingel. diff --git a/sw/README b/sw/README index dc844a6..6bfac02 100644 --- a/sw/README +++ b/sw/README @@ -1 +1,5 @@ Writer application code. + +Exakt history ist lost before Sept. 18th, 2000, but old source code +comments show that Writer core dates back until at least November +1990. diff --git a/tools/README b/tools/README index 990aff8..c5ed912 100644 --- a/tools/README +++ b/tools/README @@ -1 +1,7 @@ -Predates sal - string etc . functions, url manip, stream stuff, polygons, etc. +Predates sal - string etc . functions, url manip, stream stuff, +polygons, etc. + +Exakt history ist lost before Sept. 18th, 2000, but old source code +comments show that part of the tools library date back until at least +April 1991. +
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
