mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unuseddefaultparams

Browse Source 
Change-Id: Id895d61c0bbea99379bb6e9b4e6d6c54da4c98db
This commit is contained in:
Noel Grandin
2016-03-07 11:20:52 +02:00
parent 00ecf7899a
commit c89f73a603
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
svtools/source/contnr/imivctl.hxx
View File

@@ -358,8 +358,7 @@ public:
void SetEntryPos( void SetEntryPos(
SvxIconChoiceCtrlEntry* pEntry, SvxIconChoiceCtrlEntry* pEntry,
const Point& rPos, const Point& rPos
bool bAdjustRow = false
); );
void InvalidateEntry( SvxIconChoiceCtrlEntry* ); void InvalidateEntry( SvxIconChoiceCtrlEntry* );

24
svtools/source/contnr/imivctl1.cxx
View File

@@ -1687,8 +1687,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
rRenderContext.SetClipRegion(); rRenderContext.SetClipRegion();
} }
void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos )
bool bAdjustAtGrid )
{ {
ShowCursor( false ); ShowCursor( false );
Rectangle aBoundRect( GetEntryBoundRect( pEntry )); Rectangle aBoundRect( GetEntryBoundRect( pEntry ));
@@ -1708,27 +1707,6 @@ void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const
pEntry->aGridRect.SetPos( rPos + aGridOffs ); pEntry->aGridRect.SetPos( rPos + aGridOffs );
bAdjustVirtSize = true; bAdjustVirtSize = true;
} }
if( bAdjustAtGrid )
{
if( bAdjustVirtSize )
{
// By aligning the (in some cases newly positioned) entry, it
// can become completely visible again, so that maybe we don't
// need a scrollbar after all. To avoid suddenly turning the
// scrollbar(s) on and then off again, we use the aligned
// bounding rectangle of the entry to enlarge the virtual
// output size. The virtual size has to be adapted, because
// AdjustEntryAtGrid depends on it.
const Rectangle& rBoundRect = GetEntryBoundRect( pEntry );
Rectangle aCenterRect( CalcBmpRect( pEntry ));
Point aNewPos( AdjustAtGrid( aCenterRect, rBoundRect ) );
Rectangle aNewBoundRect( aNewPos, pEntry->aRect.GetSize());
AdjustVirtSize( aNewBoundRect );
bAdjustVirtSize = false;
}
AdjustEntryAtGrid( pEntry );
ToTop( pEntry );
}
if( bAdjustVirtSize ) if( bAdjustVirtSize )
AdjustVirtSize( pEntry->aRect ); AdjustVirtSize( pEntry->aRect );