diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:29:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 13:44:11 +0200 |
| commit | 97e000474db7c1ae3ce4b160a860ef2bd930380e (patch) | |
| tree | 6c6ca2bc42e65e25c6a66695264390bfffef3652 | |
| parent | 94e4f13d325018a74773d029e3c1c1a365cf5ccd (diff) | |
IcnCursor_Impl::GetSortListPos bVertical param wants to be of type bool
Change-Id: I2d6cbddb5dbaca33b41d87aefbb5559b3b30f674
| -rw-r--r-- | svtools/source/contnr/imivctl.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/contnr/imivctl2.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index b1dcdf86ede6..dc1946b9345d 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -584,7 +584,7 @@ class IcnCursor_Impl sal_uInt16 GetSortListPos( SvxIconChoiceCtrlEntryPtrVec& rList, long nValue, - int bVertical); + bool bVertical); SvxIconChoiceCtrlEntry* SearchCol( sal_uInt16 nCol, sal_uInt16 nTop, diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 659be51ba254..16ea52f775c9 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -34,7 +34,7 @@ IcnCursor_Impl::~IcnCursor_Impl() } sal_uInt16 IcnCursor_Impl::GetSortListPos( SvxIconChoiceCtrlEntryPtrVec& rList, long nValue, - int bVertical ) + bool bVertical ) { sal_uInt16 nCount = rList.size(); if( !nCount ) @@ -85,11 +85,11 @@ void IcnCursor_Impl::ImplCreate() nX = sal::static_int_cast< short >(nCols - 1); SvxIconChoiceCtrlEntryPtrVec& rColEntry = (*xColumns)[nX]; - sal_uInt16 nIns = GetSortListPos( rColEntry, rRect.Top(), sal_True ); + sal_uInt16 nIns = GetSortListPos( rColEntry, rRect.Top(), true ); rColEntry.insert( rColEntry.begin() + nIns, pEntry ); SvxIconChoiceCtrlEntryPtrVec& rRowEntry = (*xRows)[nY]; - nIns = GetSortListPos( rRowEntry, rRect.Left(), sal_False ); + nIns = GetSortListPos( rRowEntry, rRect.Left(), false ); rRowEntry.insert( rRowEntry.begin() + nIns, pEntry ); pEntry->nX = nX; @@ -497,7 +497,7 @@ void IcnCursor_Impl::CreateGridAjustData( IconChoiceMap& rLists, SvxIconChoiceCt 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(), sal_False ); + sal_uInt16 nIns = GetSortListPos( rLists[nY], rRect.Left(), false ); rLists[ nY ].insert( rLists[ nY ].begin() + nIns, pEntry ); } } @@ -518,7 +518,7 @@ void IcnCursor_Impl::CreateGridAjustData( IconChoiceMap& rLists, SvxIconChoiceCt short nY = (short)( ((rRect.Top()+rRect.Bottom())/2) / pView->nGridDY ); if( nY == nRefRow ) { - sal_uInt16 nIns = GetSortListPos( rRow, rRect.Left(), sal_False ); + sal_uInt16 nIns = GetSortListPos( rRow, rRect.Left(), false ); rRow.insert( rRow.begin() + nIns, pEntry ); } } |