From 40971354138e14a2aacfa4605ba0c096e000d578 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 1 Mar 2016 08:30:03 +0200 Subject: loplugin:unuseddefaultparam in svtools Change-Id: I4e9712bea0cc8cf2d48759738806a584dda8268e --- svtools/inc/roadmap.hxx | 10 ++-- svtools/inc/table/tablecontrol.hxx | 8 +-- svtools/source/brwbox/brwbox1.cxx | 78 +++++++++-------------------- svtools/source/brwbox/brwbox2.cxx | 5 +- svtools/source/brwbox/brwbox3.cxx | 4 +- svtools/source/brwbox/datwin.cxx | 5 +- svtools/source/brwbox/datwin.hxx | 2 +- svtools/source/contnr/imivctl.hxx | 16 +++--- svtools/source/contnr/imivctl1.cxx | 64 +++++++++-------------- svtools/source/contnr/imivctl2.cxx | 13 ++--- svtools/source/contnr/ivctrl.cxx | 12 ++--- svtools/source/contnr/svimpbox.cxx | 6 +-- svtools/source/contnr/svtabbx.cxx | 4 +- svtools/source/contnr/treelistbox.cxx | 19 ++++--- svtools/source/control/calendar.cxx | 24 +++------ svtools/source/control/ctrlbox.cxx | 12 ++--- svtools/source/control/fmtfield.cxx | 4 +- svtools/source/control/roadmap.cxx | 23 ++++----- svtools/source/control/toolbarmenu.cxx | 8 +-- svtools/source/control/valueset.cxx | 35 ++++--------- svtools/source/dialogs/wizardmachine.cxx | 26 ++++------ svtools/source/edit/svmedit2.cxx | 2 +- svtools/source/inc/svimpbox.hxx | 2 +- svtools/source/misc/embedhlp.cxx | 4 +- svtools/source/misc/imagemgr.cxx | 8 +-- svtools/source/misc/templatefoldercache.cxx | 8 +-- svtools/source/misc/transfer.cxx | 3 +- svtools/source/misc/transfer2.cxx | 4 +- svtools/source/misc/unitconv.cxx | 32 +++++------- svtools/source/svhtml/htmlout.cxx | 3 +- svtools/source/svrtf/parrtf.cxx | 3 +- svtools/source/table/tablecontrol.cxx | 12 ++--- 32 files changed, 182 insertions(+), 277 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index a79cd1894c45..4cc79cff7ed5 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -53,12 +53,12 @@ public: virtual ~ORoadmap( ); virtual void dispose() override; - void SetRoadmapBitmap( const BitmapEx& maBitmap, bool _bInvalidate = true ); + void SetRoadmapBitmap( const BitmapEx& maBitmap ); - void EnableRoadmapItem( ItemId _nItemId, bool _bEnable, ItemIndex _nStartIndex = 0 ); + void EnableRoadmapItem( ItemId _nItemId, bool _bEnable ); - void ChangeRoadmapItemLabel( ItemId _nID, const OUString& sLabel, ItemIndex _nStartIndex = 0 ); - void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0 ); + void ChangeRoadmapItemLabel( ItemId _nID, const OUString& sLabel ); + void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID ); void SetRoadmapInteractive( bool _bInteractive ); bool IsRoadmapInteractive(); @@ -95,7 +95,7 @@ private: const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ); - const RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ) const; + const RoadmapItem* GetByID( ItemId _nID ) const; RoadmapItem* GetPreviousHyperLabel( ItemIndex _Index); void DrawHeadline(vcl::RenderContext& rRenderContext); diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index c09cacb55ff4..b0725f51a373 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -120,7 +120,7 @@ namespace svt { namespace table SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) override; SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const override; SVT_DLLPRIVATE virtual void GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) override; - SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const override; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType) const override; SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const override; // temporary methods @@ -134,7 +134,7 @@ namespace svt { namespace table // IAccessibleTable virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override; virtual void GrabFocus() override; - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible() override; virtual vcl::Window* GetAccessibleParentWindow() const override; virtual vcl::Window* GetWindowInstance() override; virtual sal_Int32 GetAccessibleControlCount() const override; @@ -142,9 +142,9 @@ namespace svt { namespace table virtual long GetRowCount() const override; virtual long GetColumnCount() const override; virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ) override; - virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) override; + virtual Rectangle calcHeaderRect( bool _bIsColumnBar ) override; virtual Rectangle calcHeaderCellRect( bool _bIsColumnBar, sal_Int32 nPos) override; - virtual Rectangle calcTableRect( bool _bOnScreen = true ) override; + virtual Rectangle calcTableRect() override; virtual Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ) override; virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 870185098d0a..385eb089303f 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -322,13 +322,8 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId) } } -void BrowseBox::FreezeColumn( sal_uInt16 nItemId, bool bFreeze ) +void BrowseBox::FreezeColumn( sal_uInt16 nItemId ) { - - // never unfreeze the handle-column - if ( nItemId == HandleColumnId && !bFreeze ) - return; - // get the position in the current array size_t nItemPos = GetColumnPos( nItemId ); if ( nItemPos >= pCols->size() ) @@ -336,57 +331,33 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, bool bFreeze ) return; // doesn't the state change? - if ( (*pCols)[ nItemPos ]->IsFrozen() == bFreeze ) + if ( (*pCols)[ nItemPos ]->IsFrozen() ) return; // remark the column selection sal_uInt16 nSelectedColId = ToggleSelectedColumn(); - // freeze or unfreeze? - if ( bFreeze ) + // to be moved? + if ( nItemPos != 0 && !(*pCols)[ nItemPos-1 ]->IsFrozen() ) { - // to be moved? - if ( nItemPos != 0 && !(*pCols)[ nItemPos-1 ]->IsFrozen() ) - { - // move to the right of the last frozen column - sal_uInt16 nFirstScrollable = FrozenColCount(); - BrowserColumn *pColumn = (*pCols)[ nItemPos ]; - BrowserColumns::iterator it = pCols->begin(); - ::std::advance( it, nItemPos ); - pCols->erase( it ); - nItemPos = nFirstScrollable; - it = pCols->begin(); - ::std::advance( it, nItemPos ); - pCols->insert( it, pColumn ); - } - - // adjust the number of the first scrollable and visible column - if ( nFirstCol <= nItemPos ) - nFirstCol = nItemPos + 1; + // move to the right of the last frozen column + sal_uInt16 nFirstScrollable = FrozenColCount(); + BrowserColumn *pColumn = (*pCols)[ nItemPos ]; + BrowserColumns::iterator it = pCols->begin(); + ::std::advance( it, nItemPos ); + pCols->erase( it ); + nItemPos = nFirstScrollable; + it = pCols->begin(); + ::std::advance( it, nItemPos ); + pCols->insert( it, pColumn ); } - else - { - // to be moved? - if ( (sal_Int32)nItemPos != FrozenColCount()-1 ) - { - // move to the leftmost scrollable column - sal_uInt16 nFirstScrollable = FrozenColCount(); - BrowserColumn *pColumn = (*pCols)[ nItemPos ]; - BrowserColumns::iterator it = pCols->begin(); - ::std::advance( it, nItemPos ); - pCols->erase( it ); - nItemPos = nFirstScrollable; - it = pCols->begin(); - ::std::advance( it, nItemPos ); - pCols->insert( it, pColumn ); - } - // adjust the number of the first scrollable and visible column - nFirstCol = nItemPos; - } + // adjust the number of the first scrollable and visible column + if ( nFirstCol <= nItemPos ) + nFirstCol = nItemPos + 1; // toggle the freeze-state of the column - (*pCols)[ nItemPos ]->Freeze( bFreeze ); + (*pCols)[ nItemPos ]->Freeze(); // align the scrollbar-range UpdateScrollbars(); @@ -1889,10 +1860,10 @@ long BrowseBox::FirstSelectedColumn( ) const } -long BrowseBox::FirstSelectedRow( bool bInverse ) +long BrowseBox::FirstSelectedRow() { - return bMultiSelection ? uRow.pSel->FirstSelected(bInverse) : uRow.nSel; + return bMultiSelection ? uRow.pSel->FirstSelected() : uRow.nSel; } @@ -2039,7 +2010,7 @@ Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, } -Rectangle BrowseBox::GetRowRectPixel( long nRow, bool bRelToBrowser ) const +Rectangle BrowseBox::GetRowRectPixel( long nRow ) const { // get the rectangle relative to DataWin @@ -2056,11 +2027,8 @@ Rectangle BrowseBox::GetRowRectPixel( long nRow, bool bRelToBrowser ) const // adjust relative to BrowseBox's output area Point aTopLeft( aRect.TopLeft() ); - if ( bRelToBrowser ) - { - aTopLeft = pDataWin->OutputToScreenPixel( aTopLeft ); - aTopLeft = ScreenToOutputPixel( aTopLeft ); - } + aTopLeft = pDataWin->OutputToScreenPixel( aTopLeft ); + aTopLeft = ScreenToOutputPixel( aTopLeft ); return Rectangle( aTopLeft, aRect.GetSize() ); } diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 1a3cfad27e11..e178fb02918f 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -236,14 +236,13 @@ void BrowseBox::EndScroll() } -void BrowseBox::ToggleSelection( bool bForce ) +void BrowseBox::ToggleSelection() { // selection highlight-toggling allowed? if ( bHideSelect ) return; - if ( !bForce && - ( bNotToggleSel || !IsUpdateMode() || !bSelectionIsVisible ) ) + if ( bNotToggleSel || !IsUpdateMode() || !bSelectionIsVisible ) return; // only highlight painted areas! diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 7e2af122454e..c98cc999b270 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -544,9 +544,9 @@ void BrowseBox::GrabFocus() Control::GrabFocus(); } -Reference< XAccessible > BrowseBox::GetAccessible( bool bCreate ) +Reference< XAccessible > BrowseBox::GetAccessible() { - return Control::GetAccessible( bCreate ); + return Control::GetAccessible(); } vcl::Window* BrowseBox::GetAccessibleParentWindow() const diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 7df9e0ed5a66..d1fee6b3b100 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -254,7 +254,7 @@ void BrowserDataWin::LeaveUpdateLock() } } -void InitSettings_Impl(vcl::Window* pWin, bool bFont, bool bForeground, bool bBackground) +void InitSettings_Impl(vcl::Window* pWin, bool bFont, bool bForeground) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -264,8 +264,7 @@ void InitSettings_Impl(vcl::Window* pWin, bool bFont, bool bForeground, bool bBa if (bFont || bForeground) pWin->ApplyControlForeground(*pWin, rStyleSettings.GetWindowTextColor()); - if (bBackground) - pWin->ApplyControlBackground(*pWin, rStyleSettings.GetWindowColor()); + pWin->ApplyControlBackground(*pWin, rStyleSettings.GetWindowColor()); } diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 7a218617902a..d4d1495076a8 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -198,7 +198,7 @@ public: void InitSettings_Impl( vcl::Window *pWin, - bool bFont = true, bool bForeground = true, bool bBackground = true ); + bool bFont = true, bool bForeground = true ); #endif diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index e6b6fde47d3f..c01254249832 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -224,7 +224,7 @@ class SvxIconChoiceCtrl_Impl DECL_LINK_TYPED( VisRectChangedHdl, Idle*, void ); DECL_LINK_TYPED( CallSelectHdlHdl, Idle*, void ); - void AdjustScrollBars( bool bVirtSizeGrowedOnly = false); + void AdjustScrollBars(); void PositionScrollBars( long nRealWidth, long nRealHeight ); static long GetScrollBarPageSize( long nVisibleRange ) { @@ -328,7 +328,7 @@ public: void InsertEntry( SvxIconChoiceCtrlEntry*, size_t nPos, const Point* pPos=nullptr ); void CreateAutoMnemonics( MnemonicGenerator* _pGenerator = nullptr ); void FontModified(); - void SelectAll( bool bSelect = true, bool bPaint = true ); + void SelectAll( bool bSelect = true ); void SelectEntry( SvxIconChoiceCtrlEntry*, bool bSelect, @@ -372,8 +372,7 @@ public: void SetCursor( SvxIconChoiceCtrlEntry*, // true == carry selection when single-selecting - bool bSyncSingleSelection = true, - bool bShowFocusAsync = false + bool bSyncSingleSelection = true ); SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, bool bHit = false ); @@ -419,8 +418,7 @@ public: bool bIsBackgroundPainted = false); void PaintItem(const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, - sal_uInt16 nPaintFlags, vcl::RenderContext& rRenderContext, const OUString* pStr = nullptr, - vcl::ControlLayoutData* _pLayoutData = nullptr); + sal_uInt16 nPaintFlags, vcl::RenderContext& rRenderContext, const OUString* pStr = nullptr); // recalculates all BoundingRects if bMustRecalcBoundingRects == true void CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); } @@ -592,11 +590,11 @@ public: void Clear(); - GridId GetGrid( const Point& rDocPos, bool* pbClipped = nullptr ); + GridId GetGrid( const Point& rDocPos ); GridId GetGrid( sal_uInt16 nGridX, sal_uInt16 nGridY ); - GridId GetUnoccupiedGrid( bool bOccupyFound=true ); + GridId GetUnoccupiedGrid(); - void OccupyGrids( const SvxIconChoiceCtrlEntry*, bool bOccupy = true ); + void OccupyGrids( const SvxIconChoiceCtrlEntry* ); void OccupyGrid( GridId nId, bool bOccupy = true ) { DBG_ASSERT(!_pGridMap || nId<(sal_uLong)(_nGridCols*_nGridRows),"OccupyGrid: Bad GridId"); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 5cf55c7b220d..bd6fdd3af77b 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1229,7 +1229,7 @@ void SvxIconChoiceCtrl_Impl::PositionScrollBars( long nRealWidth, long nRealHeig aVerSBar->SetPosPixel( aPos ); } -void SvxIconChoiceCtrl_Impl::AdjustScrollBars( bool ) +void SvxIconChoiceCtrl_Impl::AdjustScrollBars() { long nVirtHeight = aVirtOutputSize.Height(); long nVirtWidth = aVirtOutputSize.Width(); @@ -1572,7 +1572,7 @@ void SvxIconChoiceCtrl_Impl::PaintEmphasis(const Rectangle& rTextRect, const Rec void SvxIconChoiceCtrl_Impl::PaintItem(const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nPaintFlags, - vcl::RenderContext& rRenderContext, const OUString* pStr, vcl::ControlLayoutData* _pLayoutData ) + vcl::RenderContext& rRenderContext, const OUString* pStr ) { if (eItem == IcnViewFieldTypeText) { @@ -1582,36 +1582,29 @@ void SvxIconChoiceCtrl_Impl::PaintItem(const Rectangle& rRect, else aText = *pStr; - if (_pLayoutData) + Color aOldFontColor = rRenderContext.GetTextColor(); + if (pView->AutoFontColor()) { - rRenderContext.DrawText(rRect, aText, nCurTextDrawFlags, &_pLayoutData->m_aUnicodeBoundRects, &_pLayoutData->m_aDisplayText); + Color aBkgColor(rRenderContext.GetBackground().GetColor()); + Color aFontColor; + sal_uInt16 nColor = (aBkgColor.GetRed() + aBkgColor.GetGreen() + aBkgColor.GetBlue()) / 3; + if (nColor > 127) + aFontColor.SetColor(COL_BLACK); + else + aFontColor.SetColor(COL_WHITE); + rRenderContext.SetTextColor(aFontColor); } - else - { - Color aOldFontColor = rRenderContext.GetTextColor(); - if (pView->AutoFontColor()) - { - Color aBkgColor(rRenderContext.GetBackground().GetColor()); - Color aFontColor; - sal_uInt16 nColor = (aBkgColor.GetRed() + aBkgColor.GetGreen() + aBkgColor.GetBlue()) / 3; - if (nColor > 127) - aFontColor.SetColor(COL_BLACK); - else - aFontColor.SetColor(COL_WHITE); - rRenderContext.SetTextColor(aFontColor); - } - rRenderContext.DrawText(rRect, aText, nCurTextDrawFlags); + rRenderContext.DrawText(rRect, aText, nCurTextDrawFlags); - if (pView->AutoFontColor()) - rRenderContext.SetTextColor(aOldFontColor); + if (pView->AutoFontColor()) + rRenderContext.SetTextColor(aOldFontColor); - if (pEntry->IsFocused()) - { - Rectangle aRect (CalcFocusRect(pEntry)); - ShowFocus(aRect); - DrawFocusRect(rRenderContext); - } + if (pEntry->IsFocused()) + { + Rectangle aRect (CalcFocusRect(pEntry)); + ShowFocus(aRect); + DrawFocusRect(rRenderContext); } } else @@ -2051,8 +2044,7 @@ void SvxIconChoiceCtrl_Impl::SetBoundingRect_Impl( SvxIconChoiceCtrlEntry* pEntr } -void SvxIconChoiceCtrl_Impl::SetCursor( SvxIconChoiceCtrlEntry* pEntry, bool bSyncSingleSelection, - bool bShowFocusAsync ) +void SvxIconChoiceCtrl_Impl::SetCursor( SvxIconChoiceCtrlEntry* pEntry, bool bSyncSingleSelection ) { if( pEntry == pCursor ) { @@ -2076,15 +2068,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor( SvxIconChoiceCtrlEntry* pEntry, bool bSy pCursor->SetFlags( SvxIconViewFlags::FOCUSED ); if( eSelectionMode == SINGLE_SELECTION && bSyncSingleSelection ) SelectEntry( pCursor, true ); - if( !bShowFocusAsync ) - ShowCursor( true ); - else - { - if( !nUserEventShowCursor ) - nUserEventShowCursor = - Application::PostUserEvent( LINK( this, SvxIconChoiceCtrl_Impl, UserEventHdl), - EVENTID_SHOW_CURSOR ); - } + ShowCursor( true ); } } @@ -3105,9 +3089,9 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry() const return nullptr; } -void SvxIconChoiceCtrl_Impl::SelectAll( bool bSelect, bool bPaint ) +void SvxIconChoiceCtrl_Impl::SelectAll( bool bSelect ) { - bPaint = true; + bool bPaint = true; size_t nCount = aEntries.size(); for( size_t nCur = 0; nCur < nCount && (bSelect || GetSelectionCount() ); nCur++ ) diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 549020906d57..8792ea4aee70 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -638,7 +638,7 @@ GridId IcnGridMap_Impl::GetGrid( sal_uInt16 nGridX, sal_uInt16 nGridY ) return nGridY + ( static_cast(nGridX) * _nGridRows ); } -GridId IcnGridMap_Impl::GetGrid( const Point& rDocPos, bool* pbClipped ) +GridId IcnGridMap_Impl::GetGrid( const Point& rDocPos ) { Create(); @@ -660,8 +660,6 @@ GridId IcnGridMap_Impl::GetGrid( const Point& rDocPos, bool* pbClipped ) bClipped = true; } GridId nId = GetGrid( (sal_uInt16)nX, (sal_uInt16)nY ); - if( pbClipped ) - *pbClipped = bClipped; DBG_ASSERT(nId <(sal_uLong)(_nGridCols*_nGridRows),"GetGrid failed"); return nId; } @@ -679,7 +677,7 @@ Rectangle IcnGridMap_Impl::GetGridRect( GridId nId ) nTop + _pView->nGridDY ); } -GridId IcnGridMap_Impl::GetUnoccupiedGrid( bool bOccupyFound ) +GridId IcnGridMap_Impl::GetUnoccupiedGrid() { Create(); sal_uLong nStart = 0; @@ -692,8 +690,7 @@ GridId IcnGridMap_Impl::GetUnoccupiedGrid( bool bOccupyFound ) { if( !_pGridMap[ nCur ] ) { - if( bOccupyFound ) - _pGridMap[ nCur ] = true; + _pGridMap[ nCur ] = true; return (GridId)nCur; } } @@ -709,11 +706,11 @@ GridId IcnGridMap_Impl::GetUnoccupiedGrid( bool bOccupyFound ) // An entry only means that there's a GridRect lying under its center. This // variant is much faster than allocating via the bounding rectangle but can // lead to small overlaps. -void IcnGridMap_Impl::OccupyGrids( const SvxIconChoiceCtrlEntry* pEntry, bool bOccupy ) +void IcnGridMap_Impl::OccupyGrids( const SvxIconChoiceCtrlEntry* pEntry ) { if( !_pGridMap || !SvxIconChoiceCtrl_Impl::IsBoundingRectValid( pEntry->aRect )) return; - OccupyGrid( GetGrid( pEntry->aRect.Center()), bOccupy ); + OccupyGrid( GetGrid( pEntry->aRect.Center()) ); } void IcnGridMap_Impl::Clear() diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 63b78868e30e..c11e6f3c6fd7 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -101,9 +101,9 @@ void SvtIconChoiceCtrl::dispose() Control::dispose(); } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, const Image& rImage, sal_uLong nPos, const Point* pPos, SvxIconViewFlags nFlags ) +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, const Image& rImage, sal_uLong nPos, const Point* pPos ) { - SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, nFlags); + SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, SvxIconViewFlags::NONE); _pImp->InsertEntry( pEntry, nPos, pPos ); @@ -227,11 +227,11 @@ void SvtIconChoiceCtrl::SetPointFont(const vcl::Font& rFont) } } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, bool bHit ) const +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos ) const { Point aPos( rPixPos ); aPos -= GetMapMode().GetOrigin(); - return const_cast(this)->_pImp->GetEntry( aPos, bHit ); + return const_cast(this)->_pImp->GetEntry( aPos ); } void SvtIconChoiceCtrl::SetStyle( WinBits nWinStyle ) @@ -285,9 +285,9 @@ bool SvtIconChoiceCtrl::IsEntryEditing() const return _pImp->IsEntryEditing(); } -void SvtIconChoiceCtrl::SetChoiceWithCursor ( bool bDo ) +void SvtIconChoiceCtrl::SetChoiceWithCursor() { - _pImp->SetChoiceWithCursor (bDo); + _pImp->SetChoiceWithCursor(); } void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt ) diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index e837ab6e4e45..e6607c12adf2 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -827,7 +827,7 @@ SvTreeListEntry* SvImpLBox::GetEntry( const Point& rPoint ) const } -SvTreeListEntry* SvImpLBox::MakePointVisible(const Point& rPoint, bool bNotifyScroll) +SvTreeListEntry* SvImpLBox::MakePointVisible(const Point& rPoint) { if( !pCursor ) return nullptr; @@ -845,9 +845,9 @@ SvTreeListEntry* SvImpLBox::MakePointVisible(const Point& rPoint, bool bNotifySc pView->SetEntryFocus( pCursor, false ); if( nY < 0 ) - KeyUp( false, bNotifyScroll ); + KeyUp( false ); else - KeyDown( false, bNotifyScroll ); + KeyDown( false ); } else { diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 8e845bbf0fb0..ba6e99b36ced 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -1123,9 +1123,9 @@ void SvHeaderTabListBox::GrabFocus() Control::GrabFocus(); } -Reference< XAccessible > SvHeaderTabListBox::GetAccessible( bool bCreate ) +Reference< XAccessible > SvHeaderTabListBox::GetAccessible() { - return Control::GetAccessible( bCreate ); + return Control::GetAccessible(); } vcl::Window* SvHeaderTabListBox::GetAccessibleParentWindow() const diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index c54a2a69d031..f0e9142b71f8 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -445,12 +445,12 @@ void SvTreeListBox::Clear() pModel->Clear(); // Model calls SvTreeListBox::ModelHasCleared() } -void SvTreeListBox::EnableEntryMnemonics( bool _bEnable ) +void SvTreeListBox::EnableEntryMnemonics() { - if ( _bEnable == IsEntryMnemonicsEnabled() ) + if ( IsEntryMnemonicsEnabled() ) return; - mpImpl->m_bEntryMnemonicsEnabled = _bEnable; + mpImpl->m_bEntryMnemonicsEnabled = true; Invalidate(); } @@ -1568,14 +1568,14 @@ void SvTreeListBox::DisconnectFromModel() pImp->SetModel( GetModel() ); } -void SvTreeListBox::SetSublistOpenWithReturn( bool b ) +void SvTreeListBox::SetSublistOpenWithReturn() { - pImp->bSubLstOpRet = b; + pImp->bSubLstOpRet = true; } -void SvTreeListBox::SetSublistOpenWithLeftRight( bool b ) +void SvTreeListBox::SetSublistOpenWithLeftRight() { - pImp->bSubLstOpLR = b; + pImp->bSubLstOpLR = true; } void SvTreeListBox::Resize() @@ -2273,10 +2273,9 @@ void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry ) } } -void SvTreeListBox::SetEntryHeight( short nHeight, bool bAlways ) +void SvTreeListBox::SetEntryHeight( short nHeight ) { - - if( bAlways || nHeight > nEntryHeight ) + if( nHeight > nEntryHeight ) { nEntryHeight = nHeight; if( nEntryHeight ) diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 84b217d1d095..6ca8461c7994 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -653,11 +653,8 @@ static void ImplDrawSpinArrow(vcl::RenderContext& rRenderContext, const Rectangl } //end anonymous namespace -void Calendar::ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bDrawPrev, bool bDrawNext ) +void Calendar::ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bDrawPrev ) { - if (!bDrawPrev && !bDrawNext) - return; - rRenderContext.SetLineColor(); rRenderContext.SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor()); if (bDrawPrev) @@ -669,15 +666,12 @@ void Calendar::ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bDrawPrev, aOutRect.Bottom() -= 3; ImplDrawSpinArrow(rRenderContext, aOutRect, true); } - if (bDrawNext) - { - Rectangle aOutRect = maNextRect; - aOutRect.Left() += 3; - aOutRect.Top() += 3; - aOutRect.Right() -= 3; - aOutRect.Bottom() -= 3; - ImplDrawSpinArrow(rRenderContext, aOutRect, false); - } + Rectangle aOutRect = maNextRect; + aOutRect.Left() += 3; + aOutRect.Top() += 3; + aOutRect.Right() -= 3; + aOutRect.Bottom() -= 3; + ImplDrawSpinArrow(rRenderContext, aOutRect, false); } void Calendar::ImplDrawDate(vcl::RenderContext& rRenderContext, @@ -1982,8 +1976,7 @@ void Calendar::EndSelection() } } -Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, - long nCalcLines ) const +Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine ) const { OUString a99Text("99"); vcl::Font aOldFont = GetFont(); @@ -2026,7 +2019,6 @@ Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, aSize.Height() += nTextHeight + WEEKDAY_OFFY; aSize.Height() += ((nTextHeight+DAY_OFFY)*6); aSize.Height() += MONTH_OFFY; - aSize.Height() *= nCalcLines; return aSize; } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 6697d3fb3db7..48f3fb72c047 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -492,10 +492,10 @@ Color ImpLineListData::GetColorDist( const Color& rMain, const Color& rDefault ) return ( *m_pColorDistFn )( rMain, rDefault ); } -sal_uInt16 LineListBox::GetSelectEntryStyle( sal_Int32 nSelIndex ) const +sal_uInt16 LineListBox::GetSelectEntryStyle() const { sal_uInt16 nStyle = css::table::BorderLineStyle::SOLID; - sal_Int32 nPos = GetSelectEntryPos( nSelIndex ); + sal_Int32 nPos = GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { if (!m_sNone.isEmpty()) @@ -962,9 +962,9 @@ void FontNameBox::dispose() ComboBox::dispose(); } -void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) const +void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile ) const { - OString aEntries(OUStringToOString(GetMRUEntries(cSep), + OString aEntries(OUStringToOString(GetMRUEntries(), RTL_TEXTENCODING_UTF8)); if (aEntries.isEmpty() || aFontMRUEntriesFile.isEmpty()) @@ -983,7 +983,7 @@ void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico aStream.WriteLine( OString() ); } -void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) +void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile ) { if( aFontMRUEntriesFile.isEmpty() ) return; @@ -999,7 +999,7 @@ void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico aStream.ReadLine( aLine ); OUString aEntries = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8); - SetMRUEntries( aEntries, cSep ); + SetMRUEntries( aEntries ); } void FontNameBox::InitFontMRUEntriesFile() diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 987ad98d3dc2..31aa1c8e5844 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -1010,9 +1010,9 @@ void FormattedField::Last() SpinField::Last(); } -void FormattedField::UseInputStringForFormatting( bool bUseInputStr /* = true */ ) +void FormattedField::UseInputStringForFormatting() { - m_bUseInputStringForFormatting = bUseInputStr; + m_bUseInputStringForFormatting = true; } diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index de94b791eadf..a275af78dafd 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -295,11 +295,10 @@ RoadmapItem* ORoadmap::InsertHyperLabel(ItemIndex _Index, const OUString& _sLabe return pItem; } -void ORoadmap::SetRoadmapBitmap(const BitmapEx& _rBmp, bool _bInvalidate) +void ORoadmap::SetRoadmapBitmap(const BitmapEx& _rBmp) { m_pImpl->setPicture( _rBmp ); - if ( _bInvalidate ) - Invalidate( ); + Invalidate( ); } void ORoadmap::SetRoadmapInteractive(bool _bInteractive) @@ -406,22 +405,22 @@ bool ORoadmap::IsRoadmapComplete() const return m_pImpl->isComplete(); } -void ORoadmap::EnableRoadmapItem( ItemId _nItemId, bool _bEnable, ItemIndex _nStartIndex ) +void ORoadmap::EnableRoadmapItem( ItemId _nItemId, bool _bEnable ) { - RoadmapItem* pItem = GetByID( _nItemId, _nStartIndex ); + RoadmapItem* pItem = GetByID( _nItemId ); if ( pItem != nullptr ) pItem->Enable( _bEnable ); } -void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel, ItemIndex _nStartIndex ) +void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel ) { - RoadmapItem* pItem = GetByID( _nID, _nStartIndex ); + RoadmapItem* pItem = GetByID( _nID ); if ( pItem != nullptr ) { pItem->Update( pItem->GetIndex(), _sLabel ); const HL_Vector& rItems = m_pImpl->getHyperLabels(); - for ( HL_Vector::const_iterator i = rItems.begin() + _nStartIndex; + for ( HL_Vector::const_iterator i = rItems.begin(); i != rItems.end(); ++i ) @@ -431,9 +430,9 @@ void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel, Ite } } -void ORoadmap::ChangeRoadmapItemID(ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex) +void ORoadmap::ChangeRoadmapItemID(ItemId _nID, ItemId _NewID) { - RoadmapItem* pItem = GetByID( _nID, _nStartIndex ); + RoadmapItem* pItem = GetByID( _nID ); if ( pItem != nullptr ) pItem->SetID( _NewID ); } @@ -454,9 +453,9 @@ RoadmapItem* ORoadmap::GetByID(ItemId _nID, ItemIndex _nStartIndex) return nullptr; } -const RoadmapItem* ORoadmap::GetByID(ItemId _nID, ItemIndex _nStartIndex) const +const RoadmapItem* ORoadmap::GetByID(ItemId _nID) const { - return const_cast< ORoadmap* >( this )->GetByID( _nID, _nStartIndex ); + return const_cast< ORoadmap* >( this )->GetByID( _nID ); } RoadmapItem* ORoadmap::GetByIndex(ItemIndex _nItemIndex) diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 66a0aad73276..23ae4517ee7e 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -739,15 +739,15 @@ void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, MenuItemBits } -void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits ) +void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, const Image& rImage ) { - appendEntry( new ToolbarMenuEntry( *this, nEntryId, rImage, rStr, nItemBits ) ); + appendEntry( new ToolbarMenuEntry( *this, nEntryId, rImage, rStr, MenuItemBits::NONE ) ); } -void ToolbarMenu::appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits ) +void ToolbarMenu::appendEntry( int nEntryId, Control* pControl ) { - appendEntry( new ToolbarMenuEntry( *this, nEntryId, pControl, nItemBits ) ); + appendEntry( new ToolbarMenuEntry( *this, nEntryId, pControl, MenuItemBits::NONE ) ); } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index fe799ff8cf68..556089bb1cf9 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1053,7 +1053,7 @@ bool ValueSet::ImplScroll(const Point& rPos) return true; } -size_t ValueSet::ImplGetItem( const Point& rPos, bool bMove ) const +size_t ValueSet::ImplGetItem( const Point& rPos ) const { if (!mbHasVisibleItems) { @@ -1085,13 +1085,6 @@ size_t ValueSet::ImplGetItem( const Point& rPos, bool bMove ) const return item; } } - - // return the previously selected item if spacing is set and - // the mouse hasn't left the window yet - if (bMove && mnSpacing && mnHighItemId) - { - return GetItemPos( mnHighItemId ); - } } return VALUESET_ITEM_NOTFOUND; @@ -1597,13 +1590,13 @@ void ValueSet::UserDraw( const UserDrawEvent& ) { } -void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t nPos ) +void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage ) { ValueSetItem* pItem = new ValueSetItem( *this ); pItem->mnId = nItemId; pItem->meType = VALUESETITEM_IMAGE; pItem->maImage = rImage; - ImplInsertItem( pItem, nPos ); + ImplInsertItem( pItem, VALUESET_APPEND ); } void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, @@ -1619,14 +1612,14 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, } void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, - const OUString& rText, size_t nPos ) + const OUString& rText ) { ValueSetItem* pItem = new ValueSetItem( *this ); pItem->mnId = nItemId; pItem->meType = VALUESETITEM_COLOR; pItem->maColor = rColor; pItem->maText = rText; - ImplInsertItem( pItem, nPos ); + ImplInsertItem( pItem, VALUESET_APPEND ); } void ValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos ) @@ -2162,9 +2155,9 @@ void ValueSet::EndSelection() mbSelection = false; } -void ValueSet::SetFormat(bool bFormat) +void ValueSet::SetFormat() { - mbFormat = bFormat; + mbFormat = true; } void ValueSet::StartDrag( const CommandEvent& rEvent, vcl::Region& rRegion ) @@ -2279,7 +2272,7 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCol return aSize; } -Size ValueSet::CalcItemSizePixel( const Size& rItemSize, bool bOut ) const +Size ValueSet::CalcItemSizePixel( const Size& rItemSize) const { Size aSize = rItemSize; @@ -2293,16 +2286,8 @@ Size ValueSet::CalcItemSizePixel( const Size& rItemSize, bool bOut ) const else n = ITEM_OFFSET; - if ( bOut ) - { - aSize.Width() += n; - aSize.Height() += n; - } - else - { - aSize.Width() -= n; - aSize.Height() -= n; - } + aSize.Width() += n; + aSize.Height() += n; } return aSize; diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index b39fba449589..14407ac5a2d4 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -505,28 +505,24 @@ namespace svt } - void OWizardMachine::skip(sal_Int32 _nSteps) + void OWizardMachine::skip() { - DBG_ASSERT(_nSteps > 0, "OWizardMachine::skip: invalid number of steps!"); // allowed to leave the current page? if ( !prepareLeaveCurrentState( eTravelForward ) ) return; WizardState nCurrentState = getCurrentState(); WizardState nNextState = determineNextState(nCurrentState); - // loop _nSteps steps - while (_nSteps-- > 0) - { - if (WZS_INVALID_STATE == nNextState) - return; - // remember the skipped state in the history - m_pImpl->aStateHistory.push(nCurrentState); + if (WZS_INVALID_STATE == nNextState) + return; - // get the next state - nCurrentState = nNextState; - nNextState = determineNextState(nCurrentState); - } + // remember the skipped state in the history + m_pImpl->aStateHistory.push(nCurrentState); + + // get the next state + nCurrentState = nNextState; + nNextState = determineNextState(nCurrentState); // show the (n+1)th page if (!ShowPage(nCurrentState)) @@ -615,9 +611,9 @@ namespace svt } - void OWizardMachine::enableAutomaticNextButtonState( bool _bEnable ) + void OWizardMachine::enableAutomaticNextButtonState() { - m_pImpl->m_bAutoNextButtonState = _bEnable; + m_pImpl->m_bAutoNextButtonState = true; } diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx index 533a6f7ee394..86ccf9b8737f 100644 --- a/svtools/source/edit/svmedit2.cxx +++ b/svtools/source/edit/svmedit2.cxx @@ -26,7 +26,7 @@ ExtMultiLineEdit::ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) : { } -void ExtMultiLineEdit::InsertText( const OUString& rNew, bool ) +void ExtMultiLineEdit::InsertText( const OUString& rNew ) { GetTextView()->InsertText( rNew ); } diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index c93cd2f51b3a..0f3a9d031f54 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -190,7 +190,7 @@ private: void SetNodeBmpTabDistance(); // Selection-Engine - SvTreeListEntry* MakePointVisible( const Point& rPoint, bool bNotifyScroll=true ); + SvTreeListEntry* MakePointVisible( const Point& rPoint ); void SetAnchorSelection( SvTreeListEntry* pOld, SvTreeListEntry* pNewCursor ); diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 4efd3d8de961..00b29182ae53 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -443,7 +443,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate ) } } -const Graphic* EmbeddedObjectRef::GetGraphic( OUString* pMediaType ) const +const Graphic* EmbeddedObjectRef::GetGraphic() const { try { @@ -458,8 +458,6 @@ const Graphic* EmbeddedObjectRef::GetGraphic( OUString* pMediaType ) const SAL_WARN("svtools.misc", "Something went wrong on getting the graphic: " << ex.Message); } - if ( mpImpl->pGraphic && pMediaType ) - *pMediaType = mpImpl->aMediaType; return mpImpl->pGraphic; } diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 07b02bbb9ef8..bbc70f48d3bc 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -595,11 +595,11 @@ Image SvFileInformationManager::GetImage( const INetURLObject& rObject, bool bBi return GetImageFromList_Impl( nImage, bBig ); } -Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, bool bBig ) +Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject ) { sal_Int16 nImage = GetImageId_Impl( rObject, false ); DBG_ASSERT( nImage, "invalid ImageId" ); - return GetImageFromList_Impl( nImage, bBig ); + return GetImageFromList_Impl( nImage, false/*bBig*/ ); } Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, bool bBig ) @@ -613,7 +613,7 @@ Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, return GetImageFromList_Impl( nImage, bBig ); } -Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, bool bBig ) +Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo ) { sal_uInt16 nImage = IMG_FOLDER; DBG_ASSERT( nImage, "invalid ImageId" ); @@ -627,7 +627,7 @@ Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo else if ( rInfo.m_bIsVolume ) nImage = IMG_FIXEDDEV; - return GetImageFromList_Impl( nImage, bBig ); + return GetImageFromList_Impl( nImage, false/*bBig*/ ); } OUString SvFileInformationManager::GetDescription( const INetURLObject& rObject ) diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index d8d0ea386ab5..72c7bcbfb380 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -812,15 +812,15 @@ namespace svt } - bool TemplateFolderCache::needsUpdate( bool _bForceCheck ) + bool TemplateFolderCache::needsUpdate() { - return m_pImpl->needsUpdate( _bForceCheck ); + return m_pImpl->needsUpdate( false/*_bForceCheck*/ ); } - void TemplateFolderCache::storeState( bool _bForceRetrieval ) + void TemplateFolderCache::storeState() { - m_pImpl->storeState( _bForceRetrieval ); + m_pImpl->storeState( false/*_bForceRetrieval*/ ); } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index d4761afd9672..81dd5dc34ee0 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2177,8 +2177,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window* bool TransferableDataHelper::IsEqual( const css::datatransfer::DataFlavor& rInternalFlavor, - const css::datatransfer::DataFlavor& rRequestFlavor, - bool ) + const css::datatransfer::DataFlavor& rRequestFlavor ) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); bool bRet = false; diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 444476b4a66b..f1c98bafb8da 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -525,11 +525,11 @@ bool TransferDataContainer::HasAnyData() const void TransferDataContainer::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - const Link& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage ) + const Link& rLnk, sal_Int32 nDragPointer ) { pImpl->aFinshedLnk = rLnk; TransferableHelper::StartDrag( pWindow, nDragSourceActions, - nDragPointer, nDragImage ); + nDragPointer ); } diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index dd13dad23701..e710e8d254f5 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -79,26 +79,23 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) } -void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, bool bAll ) +void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit ) { sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) ); sal_Int64 nMax = rBox.Denormalize( rBox.GetMax( FUNIT_TWIP ) ); - if ( !bAll ) + switch ( eUnit ) { - switch ( eUnit ) - { - case FUNIT_M: - case FUNIT_KM: - eUnit = FUNIT_CM; - break; + case FUNIT_M: + case FUNIT_KM: + eUnit = FUNIT_CM; + break; - case FUNIT_FOOT: - case FUNIT_MILE: - eUnit = FUNIT_INCH; - break; - default: ;//prevent warning - } + case FUNIT_FOOT: + case FUNIT_MILE: + eUnit = FUNIT_INCH; + break; + default: ;//prevent warning } rBox.SetUnit( eUnit ); @@ -107,11 +104,8 @@ void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, bool bAll ) else rBox.SetDecimalDigits( 2 ); - if ( !bAll ) - { - rBox.SetMin( rBox.Normalize( nMin ), FUNIT_TWIP ); - rBox.SetMax( rBox.Normalize( nMax ), FUNIT_TWIP ); - } + rBox.SetMin( rBox.Normalize( nMin ), FUNIT_TWIP ); + rBox.SetMax( rBox.Normalize( nMax ), FUNIT_TWIP ); } diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index c90552947704..4347544582d8 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -558,8 +558,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream, return rStream; } -SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen, - rtl_TextEncoding ) +SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen ) { // in einen Stream aus sal_Char aNToABuf[] = "0000000000000000"; diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index bdc73d363970..f5a73b6b0a6a 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -304,8 +304,9 @@ sal_Unicode SvRTFParser::GetHexValue() return nHexVal; } -void SvRTFParser::ScanText( const sal_Unicode cBreak ) +void SvRTFParser::ScanText() { + const sal_Unicode cBreak = 0; OUStringBuffer aStrBuffer; bool bContinue = true; while( bContinue && IsParserWorking() && aStrBuffer.getLength() < MAX_STRING_LEN) diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index a43b78fb58a9..b46e0adb1257 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -339,7 +339,7 @@ namespace svt { namespace table } - OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType, sal_Int32 ) const + OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType ) const { OUString aRetText; switch( eObjType ) @@ -510,9 +510,9 @@ namespace svt { namespace table } - Reference< XAccessible > TableControl::GetAccessible( bool bCreate ) + Reference< XAccessible > TableControl::GetAccessible() { - return Control::GetAccessible( bCreate ); + return Control::GetAccessible(); } @@ -616,9 +616,8 @@ namespace svt { namespace table } - Rectangle TableControl::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen) + Rectangle TableControl::calcHeaderRect(bool _bIsColumnBar ) { - (void)_bOnScreen; return m_pImpl->calcHeaderRect( !_bIsColumnBar ); } @@ -629,9 +628,8 @@ namespace svt { namespace table } - Rectangle TableControl::calcTableRect(bool _bOnScreen) + Rectangle TableControl::calcTableRect() { - (void)_bOnScreen; return m_pImpl->calcTableRect(); } -- cgit