summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-22 12:20:11 +0200
committerNoel Grandin <noel@peralex.com>2016-03-23 09:13:13 +0200
commit28d53e1a5fe5c84f6dea9793e8cc819e58fee684 (patch)
tree4c352f056ece9d1d851d3fa78c60bb01e3d406cc /svtools
parentf3d1ac75c4b7fa63022e54a9cbff46ba99535076 (diff)
loplugin:constantparm in svtools
Change-Id: I637efc68d02da527cf543d7e7bfbf51e5e70a1ad
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox2.cxx6
-rw-r--r--svtools/source/brwbox/datwin.cxx4
-rw-r--r--svtools/source/brwbox/datwin.hxx5
-rw-r--r--svtools/source/config/colorcfg.cxx6
-rw-r--r--svtools/source/config/extcolorcfg.cxx6
-rw-r--r--svtools/source/config/miscopt.cxx9
-rw-r--r--svtools/source/contnr/iconviewimpl.cxx6
-rw-r--r--svtools/source/contnr/imivctl.hxx12
-rw-r--r--svtools/source/contnr/imivctl1.cxx79
-rw-r--r--svtools/source/contnr/svimpbox.cxx6
-rw-r--r--svtools/source/graphic/grfcache.cxx4
-rw-r--r--svtools/source/graphic/grfcache.hxx5
-rw-r--r--svtools/source/graphic/grfmgr2.cxx2
-rw-r--r--svtools/source/inc/iconviewimpl.hxx3
-rw-r--r--svtools/source/inc/svimpbox.hxx2
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx20
-rw-r--r--svtools/source/table/tablecontrol_impl.hxx4
-rw-r--r--svtools/source/table/tablegeometry.hxx7
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx12
-rw-r--r--svtools/source/uno/treecontrolpeer.hxx2
20 files changed, 88 insertions, 112 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index e6d2b1ac08ba..e7e0279cd3fc 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -615,7 +615,7 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
{
ButtonFrame aButtonFrame( Point( nX, 0 ),
Size( pCol->Width()-1, GetTitleHeight()-1 ),
- pCol->Title(), false, false, !IsEnabled());
+ pCol->Title(), false, !IsEnabled());
aButtonFrame.Draw(rRenderContext);
rRenderContext.DrawLine(Point(nX + pCol->Width() - 1, 0),
Point(nX + pCol->Width() - 1, GetTitleHeight() - 1));
@@ -739,7 +739,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
{
ButtonFrame aButtonFrame( aRealPos,
Size( pFirstCol->Width()-1, nTitleHeight-1 ),
- pFirstCol->Title(), false, false, !IsEnabled());
+ pFirstCol->Title(), false, !IsEnabled());
aButtonFrame.Draw( *pDev );
pDev->Push( PushFlags::LINECOLOR );
@@ -924,7 +924,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
vcl::Region aClipToField(Rectangle(aPos, aFieldSize));
_rOut.SetClipRegion(aClipToField);
}
- pCol->Draw( *this, _rOut, aPos, false );
+ pCol->Draw( *this, _rOut, aPos );
if (_bForeignDevice)
_rOut.SetClipRegion();
}
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 12068e0d4e8d..1efb9f43a48f 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -140,13 +140,13 @@ void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZ
}
}
-void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, bool bCurs )
+void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos )
{
if ( _nId == 0 )
{
// paint handle column
ButtonFrame( rPos, Size( Width()-1, rBox.GetDataRowHeight()-1 ),
- "", false, bCurs, false ).Draw( rDev );
+ "", false/*bCurs*/, false ).Draw( rDev );
Color aOldLineColor = rDev.GetLineColor();
rDev.SetLineColor( Color( COL_BLACK ) );
rDev.DrawLine(
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index dc4f76be01de..ecb4bbe12f7b 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -45,14 +45,13 @@ class ButtonFrame
public:
ButtonFrame( const Point& rPt, const Size& rSz,
const OUString &rText,
- bool bPress,
bool bCursor,
bool _bDrawDisabled)
:aRect( rPt, rSz )
,aInnerRect( Point( aRect.Left()+1, aRect.Top()+1 ),
Size( aRect.GetWidth()-2, aRect.GetHeight()-2 ) )
,aText(rText)
- ,bPressed(bPress)
+ ,bPressed(false)
,bCurs(bCursor)
,m_bDrawDisabled(_bDrawDisabled)
{
@@ -84,7 +83,7 @@ public:
void Freeze() { _bFrozen = true; }
void Draw( BrowseBox& rBox, OutputDevice& rDev,
- const Point& rPos, bool bCurs );
+ const Point& rPos );
void SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom);
void ZoomChanged(const Fraction& rNewZoom);
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 80186fac8ea2..ef1c8681dd65 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -74,7 +74,7 @@ class ColorConfig_Impl : public utl::ConfigItem
virtual void ImplCommit() override;
public:
- explicit ColorConfig_Impl(bool bEditMode = false);
+ explicit ColorConfig_Impl();
virtual ~ColorConfig_Impl();
void Load(const OUString& rScheme);
@@ -190,9 +190,9 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme)
}
-ColorConfig_Impl::ColorConfig_Impl(bool bEditMode) :
+ColorConfig_Impl::ColorConfig_Impl() :
ConfigItem("Office.UI/ColorScheme"),
- m_bEditMode(bEditMode),
+ m_bEditMode(false),
m_bAutoDetectSystemHC(true)
{
if(!m_bEditMode)
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 4d7ca00e9fbf..7856b7b7ad9f 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -80,7 +80,7 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
virtual void ImplCommit() override;
public:
- explicit ExtendedColorConfig_Impl(bool bEditMode = false);
+ explicit ExtendedColorConfig_Impl();
virtual ~ExtendedColorConfig_Impl();
void Load(const OUString& rScheme);
@@ -195,9 +195,9 @@ OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const
bool ExtendedColorConfig_Impl::m_bLockBroadcast = false;
bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = false;
-ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(bool bEditMode) :
+ExtendedColorConfig_Impl::ExtendedColorConfig_Impl() :
ConfigItem(OUString("Office.ExtendedColorScheme")),
- m_bEditMode(bEditMode),
+ m_bEditMode(false),
m_bIsBroadcastEnabled(true)
{
if(!m_bEditMode)
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index fb2a3160856e..1210883049d5 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -175,7 +175,7 @@ public:
{ return m_nToolboxStyle ? VCL_TOOLBOX_STYLE_FLAT : 0; }
// translate from VCL settings
- void SetToolboxStyle( sal_Int16 nStyle, bool _bSetModified );
+ void SetToolboxStyle( sal_Int16 nStyle );
inline bool UseSystemPrintDialog() const
{ return m_bUseSystemPrintDialog; }
@@ -472,11 +472,10 @@ void SvtMiscOptions_Impl::CallListeners()
iter->Call( nullptr );
}
-void SvtMiscOptions_Impl::SetToolboxStyle( sal_Int16 nStyle, bool _bSetModified )
+void SvtMiscOptions_Impl::SetToolboxStyle( sal_Int16 nStyle )
{
m_nToolboxStyle = nStyle ? 1 : 0;
- if ( _bSetModified )
- SetModified();
+ SetModified();
CallListeners();
}
@@ -765,7 +764,7 @@ sal_Int16 SvtMiscOptions::GetToolboxStyle() const
void SvtMiscOptions::SetToolboxStyle( sal_Int16 nStyle )
{
- m_pDataContainer->SetToolboxStyle( nStyle, true );
+ m_pDataContainer->SetToolboxStyle( nStyle );
}
bool SvtMiscOptions::UseSystemPrintDialog() const
diff --git a/svtools/source/contnr/iconviewimpl.cxx b/svtools/source/contnr/iconviewimpl.cxx
index aad4e0fa52be..bfef9145637c 100644
--- a/svtools/source/contnr/iconviewimpl.cxx
+++ b/svtools/source/contnr/iconviewimpl.cxx
@@ -352,11 +352,9 @@ void IconViewImpl::SyncVerThumb()
aVerSBar->SetThumbPos( 0 );
}
-void IconViewImpl::UpdateAll( bool bInvalidateCompleteView,
- bool bUpdateVerScrollBar )
+void IconViewImpl::UpdateAll( bool bInvalidateCompleteView )
{
- if( bUpdateVerScrollBar )
- FindMostRight( nullptr );
+ FindMostRight( nullptr );
aVerSBar->SetRange( Range( 0, pView->GetVisibleCount() ) );
SyncVerThumb();
FillView();
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 5b78b1f7b417..d5e251399077 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -332,7 +332,6 @@ public:
void SelectEntry(
SvxIconChoiceCtrlEntry*,
bool bSelect,
- bool bCallHdl = true,
bool bAddToSelection = false,
bool bSyncPaint = false
);
@@ -354,7 +353,7 @@ public:
void LoseFocus();
void SetUpdateMode( bool bUpdate );
bool GetUpdateMode() const { return bUpdateMode; }
- void PaintEntry(SvxIconChoiceCtrlEntry*, const Point&, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted = false);
+ void PaintEntry(SvxIconChoiceCtrlEntry*, const Point&, vcl::RenderContext& rRenderContext);
void SetEntryPos(
SvxIconChoiceCtrlEntry* pEntry,
@@ -421,7 +420,7 @@ public:
sal_Int32 GetSelectionCount() const;
void SetGrid( const Size& );
Size GetMinGrid() const;
- void Scroll( long nDeltaX, long nDeltaY, bool bScrollBar = false );
+ void Scroll( long nDeltaX, long nDeltaY );
const Size& GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const;
void HideDDIcon();
@@ -438,10 +437,9 @@ public:
);
bool IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos );
- void MakeVisible(
+ void MakeVisible(
const Rectangle& rDocPos,
- bool bInScrollBarEvent=false,
- bool bCallRectChangedHdl = true
+ bool bInScrollBarEvent=false
);
void AdjustEntryAtGrid();
@@ -494,7 +492,7 @@ public:
SvxIconChoiceCtrlEntry* pEntry,
bool bKeepHighlightFlags = false
);
- void DrawHighlightFrame(vcl::RenderContext& rRenderContext, const Rectangle& rBmpRect, bool bHide);
+ void DrawHighlightFrame(vcl::RenderContext& rRenderContext, const Rectangle& rBmpRect);
void CallEventListeners( sal_uLong nEvent, void* pData = nullptr );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 819ac2d13154..dbfb1d1cf0d8 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -236,7 +236,7 @@ IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar
{
StopEntryEditing();
// arrow up: delta=-1; arrow down: delta=+1
- Scroll( 0, pScrollBar->GetDelta(), true );
+ Scroll( 0, pScrollBar->GetDelta() );
bEndScrollInvalidate = true;
}
@@ -244,7 +244,7 @@ IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScroll
{
StopEntryEditing();
// arrow left: delta=-1; arrow right: delta=+1
- Scroll( pScrollBar->GetDelta(), 0, true );
+ Scroll( pScrollBar->GetDelta(), 0 );
bEndScrollInvalidate = true;
}
@@ -343,7 +343,7 @@ void SvxIconChoiceCtrl_Impl::SetListPositions()
}
void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool bSelect,
- bool bCallHdl, bool bAdd, bool bSyncPaint )
+ bool bAdd, bool bSyncPaint )
{
if( eSelectionMode == NO_SELECTION )
return;
@@ -366,16 +366,14 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool b
nEntryFlags |= SvxIconViewFlags::SELECTED;
pEntry->AssignFlags( nEntryFlags );
nSelectionCount++;
- if( bCallHdl )
- CallSelectHandler( pEntry );
+ CallSelectHandler( pEntry );
}
else
{
nEntryFlags &= ~( SvxIconViewFlags::SELECTED);
pEntry->AssignFlags( nEntryFlags );
nSelectionCount--;
- if( bCallHdl )
- CallSelectHandler( nullptr );
+ CallSelectHandler( nullptr );
}
EntrySelected( pEntry, bSelect, bSyncPaint );
}
@@ -659,7 +657,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const Rec
const Rectangle& rBoundRect = GetEntryBoundRect(pEntry);
if (rRect.IsOver(rBoundRect))
{
- PaintEntry(pEntry, rBoundRect.TopLeft(), rRenderContext, true);
+ PaintEntry(pEntry, rBoundRect.TopLeft(), rRenderContext);
// set entries to Top if they are being repainted
pPaintedEntries->push_back(pEntry);
}
@@ -792,7 +790,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt)
if( rMEvt.GetClicks() == 2 )
{
DeselectAllBut( pEntry );
- SelectEntry( pEntry, true, true, false, true );
+ SelectEntry( pEntry, true, false, true );
pHdlEntry = pEntry;
pView->ClickIcon();
}
@@ -834,7 +832,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt)
{
DeselectAllBut( pEntry, true /* paint synchronously */ );
SetCursor( pEntry );
- SelectEntry( pEntry, true, true, false, true );
+ SelectEntry( pEntry, true, false, true );
}
else
{
@@ -879,7 +877,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonUp( const MouseEvent& rMEvt )
{
DeselectAllBut( pDocEntry );
SetCursor( pDocEntry );
- SelectEntry( pDocEntry, true, true, false, true );
+ SelectEntry( pDocEntry, true, false, true );
bHandled = true;
}
}
@@ -969,7 +967,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor,
}
else
{
- SelectEntry( pCursor, true, true, false, bPaintSync );
+ SelectEntry( pCursor, true, false, bPaintSync );
aCurSelectionRect = GetEntryBoundRect( pCursor );
CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
}
@@ -1603,7 +1601,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem(const Rectangle& rRect,
}
}
-void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted)
+void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, vcl::RenderContext& rRenderContext)
{
bool bSelected = false;
@@ -1667,7 +1665,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
sal_uInt16 nTextPaintFlags = bLargeIconMode ? PAINTFLAG_HOR_CENTERED : PAINTFLAG_VER_CENTERED;
if( !bNoEmphasis )
- PaintEmphasis(aTextRect, aBmpRect, bSelected, bDropTarget, bCursored, rRenderContext, bIsBackgroundPainted);
+ PaintEmphasis(aTextRect, aBmpRect, bSelected, bDropTarget, bCursored, rRenderContext, true/*bIsBackgroundPainted*/);
if ( bShowSelection )
vcl::RenderTools::DrawSelectionBackground(rRenderContext, *pView.get(), CalcFocusRect(pEntry),
@@ -1680,7 +1678,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
// draw highlight frame
if (pEntry == pCurHighlightFrame && !bNoEmphasis)
- DrawHighlightFrame(rRenderContext, CalcFocusRect(pEntry), false);
+ DrawHighlightFrame(rRenderContext, CalcFocusRect(pEntry));
rRenderContext.Pop();
if (bResetClipRegion)
@@ -2189,8 +2187,7 @@ void SvxIconChoiceCtrl_Impl::ClipAtVirtOutRect( Rectangle& rRect ) const
// visible
// bScrBar == true: rectangle was calculated because of a scrollbar event
-void SvxIconChoiceCtrl_Impl::MakeVisible( const Rectangle& rRect, bool bScrBar,
- bool bCallRectChangedHdl )
+void SvxIconChoiceCtrl_Impl::MakeVisible( const Rectangle& rRect, bool bScrBar )
{
Rectangle aVirtRect( rRect );
ClipAtVirtOutRect( aVirtRect );
@@ -2279,8 +2276,7 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const Rectangle& rRect, bool bScrBar,
// Vis-Rect-Changed handler is called in any case. This case may occur e.g.
// if only few pixels of the lower border are invisible, but a scrollbar has
// a larger line size.
- if( bCallRectChangedHdl || GetOutputRect() != rRect )
- VisRectChanged();
+ VisRectChanged();
}
sal_Int32 SvxIconChoiceCtrl_Impl::GetSelectionCount() const
@@ -2297,7 +2293,7 @@ void SvxIconChoiceCtrl_Impl::ToggleSelection( SvxIconChoiceCtrlEntry* pEntry )
bSel = false;
else
bSel = true;
- SelectEntry( pEntry, bSel, true, true );
+ SelectEntry( pEntry, bSel, true );
}
void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryNot,
@@ -2312,7 +2308,7 @@ void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryN
{
SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
if( pEntry != pThisEntryNot && pEntry->IsSelected() )
- SelectEntry( pEntry, false, true, true, bPaintSync );
+ SelectEntry( pEntry, false, true, bPaintSync );
}
pAnchor = nullptr;
nFlags &= (~F_ADD_MODE);
@@ -2447,7 +2443,7 @@ void SvxIconChoiceCtrl_Impl::Center( SvxIconChoiceCtrlEntry* pEntry ) const
// The deltas are the offsets by which the view is moved on the document.
// left, up: offsets < 0
// right, down: offsets > 0
-void SvxIconChoiceCtrl_Impl::Scroll( long nDeltaX, long nDeltaY, bool bScrollBar )
+void SvxIconChoiceCtrl_Impl::Scroll( long nDeltaX, long nDeltaY )
{
const MapMode& rMapMode = pView->GetMapMode();
Point aOrigin( rMapMode.GetOrigin() );
@@ -2456,7 +2452,7 @@ void SvxIconChoiceCtrl_Impl::Scroll( long nDeltaX, long nDeltaY, bool bScrollBar
aOrigin.Y() += nDeltaY;
aOrigin.X() += nDeltaX;
Rectangle aRect( aOrigin, aOutputSize );
- MakeVisible( aRect, bScrollBar );
+ MakeVisible( aRect, true/*bScrollBar*/ );
}
@@ -2548,14 +2544,14 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const Rectangle& rRect, bool bAdd,
// is inside the new selection rectangle and outside of any old one
// => select
if( !bSelected )
- SelectEntry( pEntry, true, true, true );
+ SelectEntry( pEntry, true, true );
}
else if( !bAdd )
{
// is outside of the selection rectangle
// => deselect
if( bSelected )
- SelectEntry( pEntry, false, true, true );
+ SelectEntry( pEntry, false, true );
}
else if( bAdd && bOverlaps )
{
@@ -2574,19 +2570,19 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const Rectangle& rRect, bool bAdd,
{
// deselect intersection between old rectangles and current rectangle
if( bSelected )
- SelectEntry( pEntry, false, true, true );
+ SelectEntry( pEntry, false, true );
}
else
{
// select entry of an old rectangle
if( !bSelected )
- SelectEntry( pEntry, true, true, true );
+ SelectEntry( pEntry, true, true );
}
}
else if( !bOver && bSelected )
{
// this entry is completely outside the rectangle => deselect it
- SelectEntry( pEntry, false, true, true );
+ SelectEntry( pEntry, false, true );
}
}
@@ -2618,7 +2614,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange(
{
pEntry = GetEntry( i );
if( pEntry->IsSelected() )
- SelectEntry( pEntry, false, true, true, true );
+ SelectEntry( pEntry, false, true, true );
}
}
@@ -2627,7 +2623,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange(
{
pEntry = GetEntry( i );
if( ! pEntry->IsSelected() )
- SelectEntry( pEntry, true, true, true, true );
+ SelectEntry( pEntry, true, true, true );
}
if ( ! bAdd )
@@ -2639,7 +2635,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange(
{
pEntry = GetEntry( i );
if( pEntry->IsSelected() )
- SelectEntry( pEntry, false, true, true, true );
+ SelectEntry( pEntry, false, true, true );
}
}
}
@@ -3056,7 +3052,7 @@ void SvxIconChoiceCtrl_Impl::SelectAll()
for( size_t nCur = 0; nCur < nCount; nCur++ )
{
SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
- SelectEntry( pEntry, true/*bSelect*/, true, true, bPaint );
+ SelectEntry( pEntry, true/*bSelect*/, true, bPaint );
}
nFlags &= (~F_ADD_MODE);
pAnchor = nullptr;
@@ -3474,7 +3470,7 @@ const SvxIconChoiceCtrlColumnInfo* SvxIconChoiceCtrl_Impl::GetColumn( sal_uInt16
return it->second.get();
}
-void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderContext, const Rectangle& rBmpRect, bool bHide)
+void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderContext, const Rectangle& rBmpRect)
{
Rectangle aBmpRect(rBmpRect);
long nBorder = 2;
@@ -3485,18 +3481,13 @@ void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderConte
aBmpRect.Bottom() += nBorder;
aBmpRect.Top() -= nBorder;
- if (bHide)
- pView->Invalidate(aBmpRect);
+ DecorationView aDecoView(&rRenderContext);
+ DrawHighlightFrameStyle nDecoFlags;
+ if (bHighlightFramePressed)
+ nDecoFlags = DrawHighlightFrameStyle::In;
else
- {
- DecorationView aDecoView(&rRenderContext);
- DrawHighlightFrameStyle nDecoFlags;
- if (bHighlightFramePressed)
- nDecoFlags = DrawHighlightFrameStyle::In;
- else
- nDecoFlags = DrawHighlightFrameStyle::Out;
- aDecoView.DrawHighlightFrame(aBmpRect, nDecoFlags);
- }
+ nDecoFlags = DrawHighlightFrameStyle::Out;
+ aDecoView.DrawHighlightFrame(aBmpRect, nDecoFlags);
}
void SvxIconChoiceCtrl_Impl::SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEntry,
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index d151d45a7a0b..d180559ef72e 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -695,11 +695,9 @@ void SvImpLBox::ShowCursor( bool bShow )
}
-void SvImpLBox::UpdateAll(
- bool bInvalidateCompleteView, bool bUpdateVerScrollBar )
+void SvImpLBox::UpdateAll( bool bInvalidateCompleteView )
{
- if( bUpdateVerScrollBar )
- FindMostRight(nullptr);
+ FindMostRight(nullptr);
aVerSBar->SetRange( Range(0, pView->GetVisibleCount()-1 ) );
SyncVerThumb();
FillView();
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 5ef6e8763dd7..a9fd3386460b 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -1011,9 +1011,9 @@ void GraphicCache::SetMaxDisplayCacheSize( sal_uLong nNewCacheSize )
ImplFreeDisplayCacheSpace( GetUsedDisplayCacheSize() - GetMaxDisplayCacheSize() );
}
-void GraphicCache::SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize, bool bDestroyGreaterCached )
+void GraphicCache::SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize )
{
- const bool bDestroy = ( bDestroyGreaterCached && ( nNewMaxObjSize < mnMaxObjDisplaySize ) );
+ const bool bDestroy = nNewMaxObjSize < mnMaxObjDisplaySize;
mnMaxObjDisplaySize = std::min( nNewMaxObjSize, mnMaxDisplaySize );
diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index d8408554716e..88b6406e9dc5 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -80,10 +80,7 @@ public:
void SetMaxDisplayCacheSize( sal_uLong nNewCacheSize );
sal_uLong GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; };
- void SetMaxObjDisplayCacheSize(
- sal_uLong nNewMaxObjSize,
- bool bDestroyGreaterCached = false
- );
+ void SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize );
sal_uLong GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; }
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index b0f0ea0384ef..8e3dd65c4e42 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -67,7 +67,7 @@ sal_uLong GraphicManager::GetMaxCacheSize() const
void GraphicManager::SetMaxObjCacheSize( sal_uLong nNewMaxObjSize )
{
- mpCache->SetMaxObjDisplayCacheSize( nNewMaxObjSize, true/*bDestroyGreaterCached*/ );
+ mpCache->SetMaxObjDisplayCacheSize( nNewMaxObjSize );
}
void GraphicManager::SetCacheTimeout( sal_uLong nTimeoutSeconds )
diff --git a/svtools/source/inc/iconviewimpl.hxx b/svtools/source/inc/iconviewimpl.hxx
index 1aa797c578d3..2163afc8685e 100644
--- a/svtools/source/inc/iconviewimpl.hxx
+++ b/svtools/source/inc/iconviewimpl.hxx
@@ -45,8 +45,7 @@ public:
// returns 0 if position is just past the last entry
SvTreeListEntry* GetEntry( const Point& rPoint ) const SAL_OVERRIDE;
- void UpdateAll( bool bInvalidateCompleteView = true,
- bool bUpdateVerScrollBar = true ) SAL_OVERRIDE;
+ void UpdateAll( bool bInvalidateCompleteView = true ) SAL_OVERRIDE;
bool KeyInput( const KeyEvent& ) SAL_OVERRIDE;
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 5edad7bcb7e2..521a306dc522 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -270,7 +270,7 @@ public:
void Resize();
void GetFocus();
void LoseFocus();
- virtual void UpdateAll( bool bInvalidateCompleteView= true, bool bUpdateVerSBar = true );
+ virtual void UpdateAll( bool bInvalidateCompleteView= true );
void SetEntryHeight( short nHeight );
void InvalidateEntry( SvTreeListEntry* );
virtual void RecalcFocusRect();
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 740e0c712c37..b023d909bf14 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -1324,7 +1324,7 @@ namespace svt { namespace table
else
m_aSelectedRows.push_back(m_nCurRow);
invalidateRow( m_nCurRow );
- ensureVisible(m_nCurColumn,m_nCurRow,false);
+ ensureVisible(m_nCurColumn,m_nCurRow);
selectionChanged = true;
bSuccess = true;
}
@@ -1354,7 +1354,7 @@ namespace svt { namespace table
m_aSelectedRows.push_back(m_nCurRow);
invalidateRow( m_nCurRow );
}
- ensureVisible(m_nCurColumn,m_nCurRow,false);
+ ensureVisible(m_nCurColumn,m_nCurRow);
selectionChanged = true;
bSuccess = true;
}
@@ -1518,7 +1518,7 @@ namespace svt { namespace table
}
m_pSelEngine->SetAnchor(true);
m_nAnchor = m_nCurRow;
- ensureVisible(m_nCurColumn, m_nCurRow, false);
+ ensureVisible(m_nCurColumn, m_nCurRow);
selectionChanged = true;
bSuccess = true;
}
@@ -1599,7 +1599,7 @@ namespace svt { namespace table
}
m_pSelEngine->SetAnchor(true);
m_nAnchor = m_nCurRow;
- ensureVisible(m_nCurColumn, m_nCurRow, false);
+ ensureVisible(m_nCurColumn, m_nCurRow);
selectionChanged = true;
bSuccess = true;
}
@@ -1627,7 +1627,7 @@ namespace svt { namespace table
m_nCurRow = 0;
m_nAnchor = m_nCurRow;
m_pSelEngine->SetAnchor(true);
- ensureVisible(m_nCurColumn, 0, false);
+ ensureVisible(m_nCurColumn, 0);
selectionChanged = true;
bSuccess = true;
}
@@ -1653,7 +1653,7 @@ namespace svt { namespace table
m_nCurRow = m_nRowCount-1;
m_nAnchor = m_nCurRow;
m_pSelEngine->SetAnchor(true);
- ensureVisible(m_nCurColumn, m_nRowCount-1, false);
+ ensureVisible(m_nCurColumn, m_nRowCount-1);
selectionChanged = true;
bSuccess = true;
}
@@ -1991,12 +1991,12 @@ namespace svt { namespace table
m_nCurRow = _nRow;
// ensure that the new cell is visible
- ensureVisible( m_nCurColumn, m_nCurRow, false );
+ ensureVisible( m_nCurColumn, m_nCurRow );
return true;
}
- void TableControl_Impl::ensureVisible( ColPos _nColumn, RowPos _nRow, bool _bAcceptPartialVisibility )
+ void TableControl_Impl::ensureVisible( ColPos _nColumn, RowPos _nRow )
{
DBG_ASSERT( ( _nColumn >= 0 ) && ( _nColumn < m_nColumnCount )
&& ( _nRow >= 0 ) && ( _nRow < m_nRowCount ),
@@ -2008,7 +2008,7 @@ namespace svt { namespace table
impl_scrollColumns( _nColumn - m_nLeftColumn );
else
{
- TableSize nVisibleColumns = impl_getVisibleColumns( _bAcceptPartialVisibility );
+ TableSize nVisibleColumns = impl_getVisibleColumns( false/*bAcceptPartialVisibility*/ );
if ( _nColumn > m_nLeftColumn + nVisibleColumns - 1 )
{
impl_scrollColumns( _nColumn - ( m_nLeftColumn + nVisibleColumns - 1 ) );
@@ -2021,7 +2021,7 @@ namespace svt { namespace table
impl_scrollRows( _nRow - m_nTopRow );
else
{
- TableSize nVisibleRows = impl_getVisibleRows( _bAcceptPartialVisibility );
+ TableSize nVisibleRows = impl_getVisibleRows( false/*_bAcceptPartialVisibility*/ );
if ( _nRow > m_nTopRow + nVisibleRows - 1 )
impl_scrollRows( _nRow - ( m_nTopRow + nVisibleRows - 1 ) );
}
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 43acca35fa69..e2153d9ab8ff 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -175,10 +175,8 @@ namespace svt { namespace table
@param _nRow
the row position which should be visibleMust be non-negative, and smaller
than the row count.
- @param _bAcceptPartialVisibility
- <TRUE/> if it's okay that the given coordinate is only partially visible
*/
- void ensureVisible( ColPos _nColumn, RowPos _nRow, bool _bAcceptPartialVisibility );
+ void ensureVisible( ColPos _nColumn, RowPos _nRow );
/** retrieves the content of the given cell, converted to a string
*/
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index 6fb29aa5f7b5..3c40a60b0026 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -132,11 +132,10 @@ namespace svt { namespace table
TableControl_Impl const & _rControl,
Rectangle const & _rBoundaries,
ColPos const _nCol,
- RowPos const _nRow,
- bool const i_alllowVirtualCells = false
+ RowPos const _nRow
)
- :m_aRow( _rControl, _rBoundaries, _nRow, i_alllowVirtualCells )
- ,m_aCol( _rControl, _rBoundaries, _nCol, i_alllowVirtualCells )
+ :m_aRow( _rControl, _rBoundaries, _nRow, false/*allowVirtualCells*/ )
+ ,m_aCol( _rControl, _rBoundaries, _nCol, false/*allowVirtualCells*/ )
{
}
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 95323fe6c8ab..b2644c5360dd 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -959,7 +959,7 @@ void SAL_CALL TreeControlPeer::treeNodesChanged( const css::awt::tree::TreeDataM
if( mnEditLock != 0 )
return;
- updateTree( rEvent, true );
+ updateTree( rEvent );
}
void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
@@ -969,7 +969,7 @@ void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeData
if( mnEditLock != 0 )
return;
- updateTree( rEvent, true );
+ updateTree( rEvent );
}
void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
@@ -979,7 +979,7 @@ void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataM
if( mnEditLock != 0 )
return;
- updateTree( rEvent, true );
+ updateTree( rEvent );
}
void SAL_CALL TreeControlPeer::treeStructureChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
@@ -989,10 +989,10 @@ void SAL_CALL TreeControlPeer::treeStructureChanged( const css::awt::tree::TreeD
if( mnEditLock != 0 )
return;
- updateTree( rEvent, true );
+ updateTree( rEvent );
}
-void TreeControlPeer::updateTree( const css::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive )
+void TreeControlPeer::updateTree( const css::awt::tree::TreeDataModelEvent& rEvent )
{
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
@@ -1004,7 +1004,7 @@ void TreeControlPeer::updateTree( const css::awt::tree::TreeDataModelEvent& rEve
}
if( xNode.is() )
- updateNode( rTree, xNode, bRecursive );
+ updateNode( rTree, xNode, true/*bRecursive*/ );
}
void TreeControlPeer::updateNode( UnoTreeListBoxImpl& rTree, const Reference< XTreeNode >& xNode, bool bRecursive )
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index b06daf4e00da..0187f4f5dc0d 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -129,7 +129,7 @@ private:
UnoTreeListEntry* createEntry( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos = TREELIST_APPEND );
void updateEntry( UnoTreeListEntry* pEntry );
- void updateTree( const css::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive );
+ void updateTree( const css::awt::tree::TreeDataModelEvent& rEvent );
void updateNode( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bRecursive );
void updateChildNodes( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry );