diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-30 23:08:29 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-09-12 14:18:50 +0200 |
commit | c5909e251871e5a38992fade94a489a9546e11b7 (patch) | |
tree | 7ef9bd642fb4799fb2a8d6d3529144c95a468dde /svx/source/tbxctrls | |
parent | e76d07c6185512e47947dbe1b6a83fb944b8198f (diff) |
Update many ListBox users to its sal_Int32 interface
Change-Id: I6469ac5e2d17406bee9bc434930e2471cb3bae9f
Diffstat (limited to 'svx/source/tbxctrls')
-rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 10 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index d730a44c84a6..92b89a3f3ff9 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -424,7 +424,7 @@ void SvxFillToolBoxControl::Update() // Check if the entry is not in the list if( mpLbFillAttr->GetSelectEntry() != aString ) { - sal_uInt16 nCount = mpLbFillAttr->GetEntryCount(); + const sal_Int32 nCount = mpLbFillAttr->GetEntryCount(); OUString aTmpStr; if( nCount > 0 ) { diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 91be05d287f4..53ac64e6950b 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -167,7 +167,7 @@ IMPL_LINK_NOARG_TYPED(SvxListBoxControl, PopupModeEndHdl, FloatingWindow*, void) if( pPopupWin && FloatWinPopupFlags::NONE == pPopupWin->GetPopupModeFlags() && pPopupWin->IsUserSelected() ) { - sal_uInt16 nCount = pPopupWin->GetListBox().GetSelectEntryCount(); + const sal_Int32 nCount = pPopupWin->GetListBox().GetSelectEntryCount(); INetURLObject aObj( m_aCommandURL ); @@ -179,7 +179,7 @@ IMPL_LINK_NOARG_TYPED(SvxListBoxControl, PopupModeEndHdl, FloatingWindow*, void) } -void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount ) +void SvxListBoxControl::Impl_SetInfo( sal_Int32 nCount ) { DBG_ASSERT( pPopupWin, "NULL pointer, PopupWindow missing" ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 30732a1e0f8d..6f35cff7f3d4 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -96,7 +96,7 @@ #define MAX_MRU_FONTNAME_ENTRIES 5 // don't make more than 15 entries visible at once -#define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 ) +#define MAX_STYLES_ENTRIES 15 static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); @@ -144,7 +144,7 @@ protected: private: SfxStyleFamily eStyleFamily; - sal_uInt16 nCurSel; + sal_Int32 nCurSel; bool bRelease; Size aLogicalSize; Link<> aVisibilityListener; @@ -162,7 +162,7 @@ private: void ReleaseFocus(); static Color TestColorsVisible(const Color &FontCol, const Color &BackCol); static void UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString &rStyleName); - void SetupEntry(vcl::RenderContext& rRenderContext, vcl::Window* pParent, sal_uInt16 nItem, const Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected); + void SetupEntry(vcl::RenderContext& rRenderContext, vcl::Window* pParent, sal_Int32 nItem, const Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected); static bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight); void SetOptimalSize(); DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); @@ -510,7 +510,7 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) { if(IsInDropDown()) { - sal_uInt16 nItem = GetSelectEntryPos() - 1; + const sal_Int32 nItem = GetSelectEntryPos() - 1; if(nItem < MAX_STYLES_ENTRIES) m_pButtons[nItem]->ExecuteMenu(); nHandled = true; @@ -613,7 +613,7 @@ void SvxStyleBox_Impl::UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString pDevice->DrawText(aPos, rStyleName); } -void SvxStyleBox_Impl::SetupEntry(vcl::RenderContext& rRenderContext, vcl::Window* pParent, sal_uInt16 nItem, const Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected) +void SvxStyleBox_Impl::SetupEntry(vcl::RenderContext& rRenderContext, vcl::Window* pParent, sal_Int32 nItem, const Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected) { unsigned int nId = rRect.GetHeight() != 0 ? (rRect.getY() / rRect.GetHeight()) : MAX_STYLES_ENTRIES; if (nItem == 0 || nItem == GetEntryCount() - 1) diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 074c3a940930..ddae54583704 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -142,9 +142,9 @@ FindTextFieldControl::FindTextFieldControl( vcl::Window* pParent, WinBits nStyle void FindTextFieldControl::Remember_Impl(const OUString& rStr) { - sal_uInt16 nCount = GetEntryCount(); + const sal_Int32 nCount = GetEntryCount(); - for (sal_uInt16 i=0; i<nCount; ++i) + for (sal_Int32 i=0; i<nCount; ++i) { if ( rStr == GetEntry(i)) return; @@ -280,9 +280,9 @@ SearchToolbarControllersManager& SearchToolbarControllersManager::createControll void SearchToolbarControllersManager::saveSearchHistory(const FindTextFieldControl* pFindTextFieldControl) { - sal_uInt16 nECount( pFindTextFieldControl->GetEntryCount() ); + const sal_Int32 nECount( pFindTextFieldControl->GetEntryCount() ); m_aSearchStrings.resize( nECount ); - for( sal_uInt16 i=0; i<nECount; ++i ) + for( sal_Int32 i=0; i<nECount; ++i ) { m_aSearchStrings[i] = pFindTextFieldControl->GetEntry(i); } |