summaryrefslogtreecommitdiffstats
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-22 12:07:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-23 06:19:06 +0000
commit6776fdc63bd4407ebec9267fb492cba9c1a40af2 (patch)
tree56ef463ce80f3b92815847f2ab1f88404f745229 /svtools
parentfix crash in the sidebar code (diff)
downloadcore-6776fdc63bd4407ebec9267fb492cba9c1a40af2.tar.gz
core-6776fdc63bd4407ebec9267fb492cba9c1a40af2.zip
loplugin:unusedmethods
Change-Id: I5a72ee666e71b4c5c8f43d327aa7e8eb62d1e51b Reviewed-on: https://gerrit.libreoffice.org/34537 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/imivctl.hxx7
-rw-r--r--svtools/source/contnr/imivctl1.cxx33
-rw-r--r--svtools/source/contnr/imivctl2.cxx24
3 files changed, 0 insertions, 64 deletions
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index f787bda7fd46..68cdeeceb586 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -271,7 +271,6 @@ class SvxIconChoiceCtrl_Impl
Rectangle CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const;
void ClipAtVirtOutRect( Rectangle& rRect ) const;
- void AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& rRow );
Point AdjustAtGrid(
const Rectangle& rCenterRect, // balance point of object (typically Bmp-Rect)
const Rectangle& rBoundRect
@@ -533,12 +532,6 @@ public:
SvxIconChoiceCtrlEntry* GoLeftRight( SvxIconChoiceCtrlEntry*, bool bRight );
SvxIconChoiceCtrlEntry* GoUpDown( SvxIconChoiceCtrlEntry*, bool bDown );
SvxIconChoiceCtrlEntry* GoPageUpDown( SvxIconChoiceCtrlEntry*, bool bDown );
-
- // Creates a list of entries for every row (height = nGridDY) sorted by
- // BoundRect.Left(). A list may be empty. The lists become the property of
- // the caller and have to be deleted with DestroyGridAdjustData.
- void CreateGridAjustData( IconChoiceMap& pLists );
- static void DestroyGridAdjustData( IconChoiceMap& rLists );
};
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index e5301fd1d0e4..40933e230955 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2691,39 +2691,6 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Timer *, void)
}
}
-// align a row, might expand width, doesn't break the line
-void SvxIconChoiceCtrl_Impl::AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& rRow )
-{
- if( rRow.empty() )
- return;
-
- long nCurRight = 0;
- for(SvxIconChoiceCtrlEntry* pCur : rRow)
- {
- // Decisive (for our eye) is the bitmap, else, the entry might jump too
- // much within long texts.
- const Rectangle& rBoundRect = GetEntryBoundRect( pCur );
- Rectangle aCenterRect( CalcBmpRect( pCur ));
- if( !pCur->IsPosLocked() )
- {
- long nWidth = aCenterRect.GetSize().Width();
- Point aNewPos( AdjustAtGrid( aCenterRect, rBoundRect ) );
- while( aNewPos.X() < nCurRight )
- aNewPos.X() += nGridDX;
- if( aNewPos != rBoundRect.TopLeft() )
- {
- SetEntryPos( pCur, aNewPos );
- pCur->SetFlags( SvxIconViewFlags::POS_MOVED );
- }
- nCurRight = aNewPos.X() + nWidth;
- }
- else
- {
- nCurRight = rBoundRect.Right();
- }
- }
-}
-
// Aligns a rectangle to the grid, but doesn't guarantee that the new position
// is vacant. The position can be used for SetEntryPos. The CenterRect describes
// a part of the bounding rectangle that is used for calculating the target
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index 0730f7a3ccae..ec4dd39fba4a 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -473,30 +473,6 @@ void IcnCursor_Impl::SetDeltas()
}
}
-void IcnCursor_Impl::CreateGridAjustData( IconChoiceMap& rLists )
-{
- sal_uInt16 nGridRows = (sal_uInt16)(pView->aVirtOutputSize.Height() / pView->nGridDY);
- nGridRows++; // because we round down later!
-
- if( !nGridRows )
- return;
- const size_t nCount = pView->aEntries.size();
- for( size_t nCur = 0; nCur < nCount; nCur++ )
- {
- SvxIconChoiceCtrlEntry* pEntry = pView->aEntries[ nCur ];
- const Rectangle& rRect = pView->GetEntryBoundRect( pEntry );
- short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / pView->nGridDY );
- sal_uInt16 nIns = GetSortListPos( rLists[nY], rRect.Left(), false );
- rLists[ nY ].insert( rLists[ nY ].begin() + nIns, pEntry );
- }
-}
-
-//static
-void IcnCursor_Impl::DestroyGridAdjustData( IconChoiceMap& rLists )
-{
- rLists.clear();
-}
-
IcnGridMap_Impl::IcnGridMap_Impl(SvxIconChoiceCtrl_Impl* pView)
{
_pView = pView;