diff options
90 files changed, 342 insertions, 359 deletions
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index 0a42b991d0fb..935f4a75ace0 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -134,7 +134,7 @@ public: void UpdateSelection_Acc (const ::rtl::OUString& sTextOfSelectedItem, bool b_IsDropDownList); void UpdateSelection_Impl_Acc (bool b_IsDropDownList); - void UpdateFocus_Impl_Acc ( sal_uInt16 nPos, bool b_IsDropDownList) ; + void UpdateFocus_Impl_Acc ( sal_Int32 nPos, bool b_IsDropDownList) ; static void NotifyListItem(css::uno::Any& val); protected: BoxType m_aBoxType; @@ -201,8 +201,8 @@ private: void UpdateEntryRange_Impl(); protected: - void UpdateSelection_Impl (sal_uInt16 nPos = 0); - bool checkEntrySelected(sal_uInt16 _nPos, + void UpdateSelection_Impl(sal_Int32 nPos = 0); + bool checkEntrySelected(sal_Int32 _nPos, css::uno::Any& _rNewValue, css::uno::Reference< css::accessibility::XAccessible >& _rxNewAcc); private: diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 7b2dd3ed9d3d..955eecffc57a 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -174,10 +174,8 @@ void VCLXAccessibleList::notifyVisibleStates(bool _bSetNew ) VCLXAccessibleListItem* pItem = static_cast<VCLXAccessibleListItem*>(xHold.get()); if ( pItem ) { - sal_uInt16 nTopEntry = 0; - if ( m_pListBoxHelper ) - nTopEntry = m_pListBoxHelper->GetTopEntry(); - sal_uInt16 nPos = (sal_uInt16)(aIter - m_aAccessibleChildren.begin()); + const sal_Int32 nTopEntry = m_pListBoxHelper ? m_pListBoxHelper->GetTopEntry() : 0; + const sal_Int32 nPos = static_cast<sal_Int32>(aIter - m_aAccessibleChildren.begin()); bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); pItem->SetVisible( m_bVisible && bVisible ); } @@ -215,7 +213,7 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool bHasDropDownList) Reference< XAccessible > xNewAcc; if ( m_pListBoxHelper ) { - sal_uInt32 i=0; + sal_Int32 i=0; m_nCurSelectedPos = LISTBOX_ENTRY_NOTFOUND; for ( ListItems::iterator aIter = m_aAccessibleChildren.begin(); aIter != m_aAccessibleChildren.end(); ++aIter,++i) @@ -244,7 +242,7 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool bHasDropDownList) checkEntrySelected(i,aNewValue,xNewAcc); } } - sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount(); + const sal_Int32 nCount = m_pListBoxHelper->GetEntryCount(); if ( i < nCount ) // here we have to check the if any other listbox entry is selected { for (; i < nCount && !checkEntrySelected(i,aNewValue,xNewAcc) ;++i ) @@ -309,7 +307,7 @@ void VCLXAccessibleList::NotifyListItem(css::uno::Any& val) } } -void VCLXAccessibleList::UpdateFocus_Impl_Acc (sal_uInt16 nPos ,bool b_IsDropDownList) +void VCLXAccessibleList::UpdateFocus_Impl_Acc (sal_Int32 nPos ,bool b_IsDropDownList) { if (!(m_aBoxType == LISTBOX && !b_IsDropDownList)) { @@ -498,17 +496,16 @@ void VCLXAccessibleList::UpdateSelection (const OUString& sTextOfSelectedItem) -Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i) +Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 nPos) { Reference<XAccessible> xChild; - sal_uInt16 nPos = static_cast<sal_uInt16>(i); - if ( nPos >= m_aAccessibleChildren.size() ) + if ( static_cast<size_t>(nPos) >= m_aAccessibleChildren.size() ) { m_aAccessibleChildren.resize(nPos + 1); // insert into the container - xChild = new VCLXAccessibleListItem(m_pListBoxHelper, i, this); + xChild = new VCLXAccessibleListItem(m_pListBoxHelper, nPos, this); m_aAccessibleChildren[nPos] = xChild; } else @@ -517,7 +514,7 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i) // check if position is empty and can be used else we have to adjust all entries behind this if (!xChild.is()) { - xChild = new VCLXAccessibleListItem(m_pListBoxHelper, i, this); + xChild = new VCLXAccessibleListItem(m_pListBoxHelper, nPos, this); m_aAccessibleChildren[nPos] = xChild; } } @@ -527,17 +524,15 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i) // Just add the SELECTED state. bool bNowSelected = false; if ( m_pListBoxHelper ) - bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((sal_uInt16)i); + bNowSelected = m_pListBoxHelper->IsEntryPosSelected(nPos); if (bNowSelected) - m_nCurSelectedPos = sal_uInt16(i); + m_nCurSelectedPos = nPos; VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(xChild.get()); pItem->SetSelected( bNowSelected ); // Set the child's VISIBLE state. UpdateVisibleLineCount(); - sal_uInt16 nTopEntry = 0; - if ( m_pListBoxHelper ) - nTopEntry = m_pListBoxHelper->GetTopEntry(); + const sal_Int32 nTopEntry = m_pListBoxHelper ? m_pListBoxHelper->GetTopEntry() : 0; bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); pItem->SetVisible( m_bVisible && bVisible ); } @@ -693,7 +688,7 @@ void VCLXAccessibleList::UpdateEntryRange_Impl() m_nLastTopEntry = nTop; } -bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc) +bool VCLXAccessibleList::checkEntrySelected(sal_Int32 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc) { OSL_ENSURE(m_pListBoxHelper,"Helper is not valid!"); bool bNowSelected = false; @@ -710,7 +705,7 @@ bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Ref } -void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) +void VCLXAccessibleList::UpdateSelection_Impl(sal_Int32) { uno::Any aOldValue, aNewValue; @@ -721,7 +716,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) if ( m_pListBoxHelper ) { - sal_uInt16 i=0; + sal_Int32 i=0; m_nCurSelectedPos = LISTBOX_ENTRY_NOTFOUND; for ( ListItems::iterator aIter = m_aAccessibleChildren.begin(); aIter != m_aAccessibleChildren.end(); ++aIter,++i) @@ -750,7 +745,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) checkEntrySelected(i,aNewValue,xNewAcc); } } - sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount(); + const sal_Int32 nCount = m_pListBoxHelper->GetEntryCount(); if ( i < nCount ) // here we have to check the if any other listbox entry is selected { for (; i < nCount && !checkEntrySelected(i,aNewValue,xNewAcc) ;++i ) @@ -848,8 +843,8 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime if ( m_pListBoxHelper ) { - sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount(); - for ( sal_uInt16 i = 0; i < nCount; ++i ) + const sal_Int32 nCount = m_pListBoxHelper->GetEntryCount(); + for ( sal_Int32 i = 0; i < nCount; ++i ) m_pListBoxHelper->SelectEntryPos( i ); // call the select handler, don't handle events in this time m_bDisableProcessEvent = true; diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index d9ca3cbc5670..1bccb0560742 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -526,8 +526,8 @@ void LibPage::dispose() { if (m_pBasicsBox) { - sal_uInt16 nCount = m_pBasicsBox->GetEntryCount(); - for ( sal_uInt16 i = 0; i < nCount; ++i ) + const sal_Int32 nCount = m_pBasicsBox->GetEntryCount(); + for ( sal_Int32 i = 0; i < nCount; ++i ) { DocumentEntry* pEntry = static_cast<DocumentEntry*>(m_pBasicsBox->GetEntryData( i )); delete pEntry; @@ -1397,13 +1397,13 @@ void LibPage::FillListBox() void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ) { OUString aEntryText( rDocument.getTitle( eLocation ) ); - sal_uInt16 nPos = m_pBasicsBox->InsertEntry( aEntryText ); + const sal_Int32 nPos = m_pBasicsBox->InsertEntry( aEntryText ); m_pBasicsBox->SetEntryData( nPos, new DocumentEntry(rDocument, eLocation) ); } void LibPage::SetCurLib() { - sal_uInt16 nSelPos = m_pBasicsBox->GetSelectEntryPos(); + const sal_Int32 nSelPos = m_pBasicsBox->GetSelectEntryPos(); DocumentEntry* pEntry = static_cast<DocumentEntry*>(m_pBasicsBox->GetEntryData( nSelPos )); if ( pEntry ) { diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index b1b7f8b120ac..47e765b8696c 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -125,7 +125,7 @@ void ManageLanguageDialog::FillLanguageBox() { sLanguage += " " + m_sDefLangStr; } - sal_uInt16 nPos = m_pLanguageLB->InsertEntry( sLanguage ); + const sal_Int32 nPos = m_pLanguageLB->InsertEntry( sLanguage ); m_pLanguageLB->SetEntryData( nPos, new LanguageEntry( sLanguage, pLocale[i], bIsDefault ) ); } } @@ -135,8 +135,8 @@ void ManageLanguageDialog::FillLanguageBox() void ManageLanguageDialog::ClearLanguageBox() { - sal_uInt16 i, nCount = m_pLanguageLB->GetEntryCount(); - for ( i = 0; i < nCount; ++i ) + const sal_Int32 nCount = m_pLanguageLB->GetEntryCount(); + for ( sal_Int32 i = 0; i < nCount; ++i ) { LanguageEntry* pEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData(i)); delete pEntry; @@ -173,13 +173,13 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void) ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelangdialog.ui"); if ( aQBox->Execute() == RET_OK ) { - sal_uInt16 i, nCount = m_pLanguageLB->GetSelectEntryCount(); - sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos(); + sal_Int32 nCount = m_pLanguageLB->GetSelectEntryCount(); + sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); // remove locales Sequence< Locale > aLocaleSeq( nCount ); - for ( i = 0; i < nCount; ++i ) + for ( sal_Int32 i = 0; i < nCount; ++i ) { - sal_uInt16 nSelPos = m_pLanguageLB->GetSelectEntryPos(i); + const sal_Int32 nSelPos = m_pLanguageLB->GetSelectEntryPos(i); LanguageEntry* pEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nSelPos )); if ( pEntry ) aLocaleSeq[i] = pEntry->m_aLocale; @@ -199,7 +199,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void) IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void) { - sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos )); if ( pSelectEntry && !pSelectEntry->m_bIsDefault ) { @@ -216,7 +216,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void) IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) { - sal_uInt16 nCount = m_pLanguageLB->GetEntryCount(); + const sal_Int32 nCount = m_pLanguageLB->GetEntryCount(); bool bEmpty = ( !nCount || m_pLanguageLB->GetEntryPos( m_sCreateLangStr ) != LISTBOX_ENTRY_NOTFOUND ); bool bSelect = ( m_pLanguageLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); @@ -286,13 +286,13 @@ void SetDefaultLanguageDialog::FillLanguageBox() // remove the already localized languages Sequence< Locale > aLocaleSeq = m_xLocalizationMgr->getStringResourceManager()->getLocales(); const Locale* pLocale = aLocaleSeq.getConstArray(); - sal_Int32 i, nCount = aLocaleSeq.getLength(); - for ( i = 0; i < nCount; ++i ) + const sal_Int32 nCountLoc = aLocaleSeq.getLength(); + for ( sal_Int32 i = 0; i < nCountLoc; ++i ) m_pLanguageLB->RemoveLanguage( LanguageTag::convertToLanguageType( pLocale[i] ) ); // fill checklistbox if not in default mode - sal_uInt16 j, nCount_ = m_pLanguageLB->GetEntryCount(); - for ( j = 0; j < nCount_; ++j ) + const sal_Int32 nCountLang = m_pLanguageLB->GetEntryCount(); + for ( sal_Int32 j = 0; j < nCountLang; ++j ) { m_pCheckLangLB->InsertEntry( m_pLanguageLB->GetEntry(j), LISTBOX_APPEND, m_pLanguageLB->GetEntryData(j) ); @@ -315,9 +315,9 @@ Sequence< Locale > SetDefaultLanguageDialog::GetLocales() const } else { - sal_uInt16 i, nCount = static_cast< sal_uInt16 >( m_pCheckLangLB->GetEntryCount() ); + const sal_Int32 nCount = m_pCheckLangLB->GetEntryCount(); sal_Int32 j = 0; - for ( i = 0; i < nCount; ++i ) + for ( sal_Int32 i = 0; i < nCount; ++i ) { if ( m_pCheckLangLB->IsChecked(i) ) { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 5dec3ea17d6c..0ee407795f0e 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -121,7 +121,7 @@ namespace rListBox.SelectEntry( rColor ); if( rListBox.GetSelectEntryCount() == 0 ) { - sal_uInt16 nPos = rListBox.InsertEntry( rColor, lcl_makeColorName( rColor ) ); + const sal_Int32 nPos = rListBox.InsertEntry( rColor, lcl_makeColorName( rColor ) ); rListBox.SelectEntryPos( nPos ); } } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 97fba02ada42..62e6e35719b9 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -165,7 +165,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs) for( sal_Int32 nN=0; nN<m_aCategories.getLength() && nN<nMaxCount; nN++ ) m_pED_CrossesAtCategory->InsertEntry( m_aCategories[nN] ); - sal_uInt16 nCount = m_pED_CrossesAtCategory->GetEntryCount(); + sal_Int32 nCount = m_pED_CrossesAtCategory->GetEntryCount(); if( nCount>30 ) nCount=30; m_pED_CrossesAtCategory->SetDropDownLineCount( nCount ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index b638ca467cad..59e5b9c06d35 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -39,8 +39,10 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -#define POS_3DSCHEME_SIMPLE 0 -#define POS_3DSCHEME_REALISTIC 1 +enum { + POS_3DSCHEME_SIMPLE = 0, + POS_3DSCHEME_REALISTIC = 1 +}; class Dim3DLookResourceGroup : public ChangingResource { @@ -93,7 +95,7 @@ void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter& rParameter void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.b3DLook = m_pCB_3DLook->IsChecked(); - sal_uInt16 nPos = m_pLB_Scheme->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLB_Scheme->GetSelectEntryPos(); if( POS_3DSCHEME_SIMPLE == nPos ) rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple; else if( POS_3DSCHEME_REALISTIC == nPos ) @@ -600,7 +602,7 @@ IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void ChartTypeParameter aOldParameter; getSplinePropertiesDialog().fillParameter( aOldParameter, POS_LINETYPE_SMOOTH == m_pLB_LineType->GetSelectEntryPos() ); - sal_uInt16 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); + const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH); if( RET_OK == getSplinePropertiesDialog().Execute() ) { @@ -620,7 +622,7 @@ IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, voi ChartTypeParameter aOldParameter; getSteppedPropertiesDialog().fillParameter( aOldParameter, POS_LINETYPE_STEPPED == m_pLB_LineType->GetSelectEntryPos() ); - sal_uInt16 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); + const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED); if( RET_OK == getSteppedPropertiesDialog().Execute() ) { diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 0b9e69e647cf..42639c3213b8 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -260,7 +260,7 @@ enum AxisTypeListBoxEntry IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl) { - sal_uInt16 nPos = m_pLB_AxisType->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos(); if( nPos==TYPE_DATE ) m_nAxisType = chart2::AxisType::DATE; else diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 732bf479bcae..894f8a610545 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -160,7 +160,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() if( bSelectionFound ) SelectEntryPos(nEntryPosToSelect); - sal_uInt16 nEntryCount = GetEntryCount(); + sal_Int32 nEntryCount = GetEntryCount(); if( nEntryCount > 100 ) nEntryCount = 100; SetDropDownLineCount( nEntryCount ); @@ -188,8 +188,8 @@ void SelectorListBox::Select() if ( !IsTravelSelect() ) { - sal_uInt16 nPos = GetSelectEntryPos(); - if( nPos < m_aEntries.size() ) + const sal_Int32 nPos = GetSelectEntryPos(); + if( static_cast<size_t>(nPos) < m_aEntries.size() ) { ObjectHierarchy::tOID aOID = m_aEntries[nPos].OID; Reference< view::XSelectionSupplier > xSelectionSupplier( m_xChartController.get(), uno::UNO_QUERY ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index d6654a8e0356..a69e8a1eeb17 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1590,7 +1590,7 @@ void SvxConfigPage::Reset( const SfxItemSet* ) // all other open documents of the same module type if ( !bInitialised ) { - sal_uInt16 nPos = 0; + sal_Int32 nPos = 0; uno::Reference < css::ui::XUIConfigurationManager > xCfgMgr; uno::Reference < css::ui::XUIConfigurationManager > xDocCfgMgr; @@ -1884,7 +1884,7 @@ IMPL_LINK( SvxConfigPage, SelectSaveInLocation, ListBox *, pBox ) void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect ) { - sal_uInt16 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); + sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); m_pTopLevelListBox->Clear(); if ( GetSaveInData() && GetSaveInData()->GetEntries() ) @@ -1895,7 +1895,7 @@ void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect ) for ( ; iter != end; ++iter ) { SvxConfigEntry* pEntryData = *iter; - sal_uInt16 nPos = m_pTopLevelListBox->InsertEntry( stripHotKey( pEntryData->GetName() ) ); + const sal_Int32 nPos = m_pTopLevelListBox->InsertEntry( stripHotKey( pEntryData->GetName() ) ); m_pTopLevelListBox->SetEntryData( nPos, pEntryData ); if ( pEntryData == pToSelect ) @@ -1936,7 +1936,7 @@ void SvxConfigPage::AddSubMenusToUI( subMenuTitle += aMenuSeparatorStr; subMenuTitle += stripHotKey( pEntryData->GetName() ); - sal_uInt16 nPos = m_pTopLevelListBox->InsertEntry( subMenuTitle ); + const sal_Int32 nPos = m_pTopLevelListBox->InsertEntry( subMenuTitle ); m_pTopLevelListBox->SetEntryData( nPos, pEntryData ); AddSubMenusToUI( subMenuTitle, pEntryData ); @@ -2958,7 +2958,7 @@ void SvxToolbarConfigPage::dispose() void SvxToolbarConfigPage::DeleteSelectedTopLevel() { - sal_uInt16 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); + const sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); ToolbarSaveInData* pSaveInData = static_cast<ToolbarSaveInData*>( GetSaveInData() ); pSaveInData->RemoveToolbar( GetTopLevelSelection() ); @@ -3053,7 +3053,7 @@ void SvxToolbarConfigPage::MoveEntry( bool bMoveUp ) IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void ) { - sal_uInt16 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); + sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); SvxConfigEntry* pToolbar = static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos )); @@ -3424,7 +3424,7 @@ void SvxToolbarConfigPage::Init() ReloadTopLevelListBox(); - sal_uInt16 nPos = 0; + sal_Int32 nPos = 0; if ( !m_aURLToSelect.isEmpty() ) { for ( sal_Int32 i = 0 ; i < m_pTopLevelListBox->GetEntryCount(); ++i ) @@ -4411,13 +4411,12 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) VclPtrInstance< SvxNewToolbarDialog > pNameDialog( nullptr, aNewName ); - sal_uInt16 nInsertPos; for ( sal_Int32 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i ) { SaveInData* pData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( i )); - nInsertPos = pNameDialog->m_pSaveInListBox->InsertEntry( + const sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->InsertEntry( m_pSaveInListBox->GetEntry( i ) ); pNameDialog->m_pSaveInListBox->SetEntryData( nInsertPos, pData ); @@ -4430,7 +4429,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) { aNewName = pNameDialog->GetName(); - nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos(); + sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos(); ToolbarSaveInData* pData = static_cast<ToolbarSaveInData*>( pNameDialog->m_pSaveInListBox->GetEntryData( nInsertPos )); diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 4b7d8f8c65db..347d1ab8e600 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -83,9 +83,8 @@ SvxEventConfigPage::SvxEventConfigPage(vcl::Window *pParent, const SfxItemSet& r xSupplier = frame::theGlobalEventBroadcaster::get(::comphelper::getProcessComponentContext()); - sal_uInt16 nPos(0); m_xAppEvents = xSupplier->getEvents(); - nPos = m_pSaveInListBox->InsertEntry( + const sal_Int32 nPos = m_pSaveInListBox->InsertEntry( utl::ConfigManager::getProductName() ); m_pSaveInListBox->SetEntryData( nPos, new bool(true) ); m_pSaveInListBox->SelectEntryPos( nPos ); @@ -154,7 +153,7 @@ void SvxEventConfigPage::ImplInitDocument() m_xDocumentModifiable.set(xModel, css::uno::UNO_QUERY); OUString aTitle = ::comphelper::DocumentInfo::getDocumentTitle( xModel ); - sal_uInt16 nPos = m_pSaveInListBox->InsertEntry( aTitle ); + const sal_Int32 nPos = m_pSaveInListBox->InsertEntry( aTitle ); m_pSaveInListBox->SetEntryData( nPos, new bool(false) ); m_pSaveInListBox->SelectEntryPos( nPos ); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 07183e85ba59..fd605cddbdde 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -331,7 +331,7 @@ void SvxCharacterMap::init() if ( aFontName != aLastName ) { aLastName = aFontName; - sal_uInt16 nPos = m_pFontLB->InsertEntry( aFontName ); + const sal_Int32 nPos = m_pFontLB->InsertEntry( aFontName ); m_pFontLB->SetEntryData( nPos, reinterpret_cast<void*>(i) ); } } @@ -426,8 +426,8 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox) IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) { - sal_uInt16 nPos = m_pFontLB->GetSelectEntryPos(), - nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos )); + const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos(); + const sal_uInt16 nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos )); aFont = GetDevFont( nFont ); aFont.SetWeight( WEIGHT_DONTKNOW ); aFont.SetItalic( ITALIC_NONE ); @@ -460,7 +460,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) const Subset* s; while( NULL != (s = pSubsetMap->GetNextSubset( bFirst )) ) { - sal_uInt16 nPos_ = m_pSubsetLB->InsertEntry( s->GetName() ); + const sal_Int32 nPos_ = m_pSubsetLB->InsertEntry( s->GetName() ); m_pSubsetLB->SetEntryData( nPos_, const_cast<Subset *>(s) ); // NOTE: subset must live at least as long as the selected font if( bFirst ) @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl) { - sal_uInt16 nPos = m_pSubsetLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos(); const Subset* pSubset = static_cast<const Subset*> (m_pSubsetLB->GetEntryData(nPos)); if( pSubset ) { diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 5774baa34bdd..0f42f1ac5afc 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -92,8 +92,8 @@ void SearchThread::execute() if( !aFileType.isEmpty() ) { - const sal_uInt16 nFileNumber = mpBrowser->m_pCbbFileType->GetEntryPos( aFileType ); - sal_uInt16 nBeginFormat, nEndFormat; + const sal_Int32 nFileNumber = mpBrowser->m_pCbbFileType->GetEntryPos( aFileType ); + sal_Int32 nBeginFormat, nEndFormat; ::std::vector< OUString > aFormats; if( !nFileNumber || ( nFileNumber >= mpBrowser->m_pCbbFileType->GetEntryCount() ) ) @@ -104,7 +104,7 @@ void SearchThread::execute() else nBeginFormat = nEndFormat = nFileNumber; - for( sal_uInt16 i = nBeginFormat; i <= nEndFormat; ++i ) + for( sal_Int32 i = nBeginFormat; i <= nEndFormat; ++i ) aFormats.push_back( mpBrowser->aFilterEntryList[ i ]->aFilterName.toAsciiLowerCase() ); ImplSearch( maStartURL, aFormats, mpBrowser->bSearchRecursive ); @@ -303,9 +303,9 @@ TakeThread::~TakeThread() void TakeThread::execute() { INetURLObject aURL; - sal_uInt16 nEntries; + sal_Int32 nEntries; GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme; - sal_uInt16 nPos; + sal_Int32 nPos; GalleryProgress* pStatusProgress; { @@ -315,7 +315,7 @@ void TakeThread::execute() pThm->LockBroadcaster(); } - for( sal_uInt16 i = 0; i < nEntries && schedule(); i++ ) + for( sal_Int32 i = 0; i < nEntries && schedule(); ++i ) { if( mpBrowser->bTakeAll ) aURL = INetURLObject( mpBrowser->aFoundList[ nPos = i ] ); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 12d98d121290..e4d4b0a664db 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -448,7 +448,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void) m_pLbDocTypes->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { // get private-url - sal_uInt16 nPos = m_pLbDocTypes->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); aNewURL.setExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt ); } diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 2a66dae2a47d..4d454c78daf7 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -122,7 +122,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void) } else { - sal_uInt16 nPos = m_pPathLB->InsertEntry( sInsPath ); + const sal_Int32 nPos = m_pPathLB->InsertEntry( sInsPath ); m_pPathLB->SetEntryData( nPos, new OUString( aURL ) ); } @@ -158,9 +158,9 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void) IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, DelHdl_Impl, Button*, void) { - sal_uInt16 nPos = m_pPathLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pPathLB->GetSelectEntryPos(); m_pPathLB->RemoveEntry( nPos ); - sal_uInt16 nCnt = m_pPathLB->GetEntryCount(); + sal_Int32 nCnt = m_pPathLB->GetEntryCount(); if ( nCnt ) { @@ -252,7 +252,7 @@ void SvxPathSelectDialog::dispose() { if (m_pPathLB) { - sal_uInt16 nPos = m_pPathLB->GetEntryCount(); + sal_Int32 nPos = m_pPathLB->GetEntryCount(); while ( nPos-- ) delete static_cast<OUString*>(m_pPathLB->GetEntryData(nPos)); } @@ -337,7 +337,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath ) void SvxPathSelectDialog::SetPath(const OUString& rPath) { sal_Unicode cDelim = SVT_SEARCHPATH_DELIMITER; - sal_uInt16 nPos, nCount = comphelper::string::getTokenCount(rPath, cDelim); + sal_uInt16 nCount = comphelper::string::getTokenCount(rPath, cDelim); for ( sal_uInt16 i = 0; i < nCount; ++i ) { @@ -346,6 +346,7 @@ void SvxPathSelectDialog::SetPath(const OUString& rPath) bool bIsSystemPath = osl::FileBase::getSystemPathFromFileURL(sPath, sSystemPath) == osl::FileBase::E_None; + sal_Int32 nPos = 0; if ( bIsSystemPath ) nPos = m_pPathLB->InsertEntry( sSystemPath ); else diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 4604ca5cf714..4842aff3137e 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -386,7 +386,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox ) { if (pBox && !m_pWordCB->IsTravelSelect()) // act only upon return key and not when traveling with cursor keys { - sal_uInt16 nPos = pBox->GetSelectEntryPos(); + const sal_Int32 nPos = pBox->GetSelectEntryPos(); OUString aStr( pBox->GetEntry( nPos ) ); aStr = linguistic::GetThesaurusReplaceText( aStr ); m_pWordCB->SetText( aStr ); diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 5b8911db6fa3..4ef91cbfafb8 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -115,7 +115,7 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* ) if ( m_pNumeralsLB->IsValueChangedFromSaved() ) { - sal_uInt16 nPos = m_pNumeralsLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pNumeralsLB->GetSelectEntryPos(); aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos ); bModified = true; } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e869664e532f..7f84f2c0bb3f 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -737,7 +737,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) bool bRepaintWindows(false); SvtMiscOptions aMiscOptions; - sal_uInt16 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectEntryPos(); + const sal_Int32 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectEntryPos(); if( nSizeLB_InitialSelection != nSizeLB_NewSelection ) { // from now on it's modified, even if via auto setting the same size was set as now selected in the LB @@ -753,7 +753,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) aMiscOptions.SetSymbolsSize( eSet ); } - sal_uInt16 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectEntryPos(); + const sal_Int32 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectEntryPos(); if( nStyleLB_InitialSelection != nStyleLB_NewSelection ) { // 0 means choose style automatically @@ -761,7 +761,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) aMiscOptions.SetIconTheme("auto"); else { - sal_uInt16 pos = m_pIconStyleLB->GetSelectEntryPos(); + const sal_Int32 pos = m_pIconStyleLB->GetSelectEntryPos(); const vcl::IconThemeInfo& iconThemeId = mInstalledIconThemes.at(pos-1); aMiscOptions.SetIconTheme(iconThemeId.GetThemeId()); } @@ -1069,7 +1069,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& { //sal_uInt16 p = m_pUserInterfaceLB->InsertLanguage(aLang); OUString aLangStr( SvtLanguageTable::GetLanguageString( aLang, true ) ); - sal_uInt16 p = m_pUserInterfaceLB->InsertEntry(aLangStr); + const sal_Int32 p = m_pUserInterfaceLB->InsertEntry(aLangStr); m_pUserInterfaceLB->SetEntryData(p, reinterpret_cast<void*>(i+1)); } } @@ -1129,7 +1129,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& aStr_ = ApplyLreOrRleEmbedding( aStr_ ) + aTwoSpace + ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( pCurr->GetLanguage() ) ); - sal_uInt16 nPos = m_pCurrencyLB->InsertEntry( aStr_ ); + const sal_Int32 nPos = m_pCurrencyLB->InsertEntry( aStr_ ); m_pCurrencyLB->SetEntryData( nPos, const_cast<NfCurrencyEntry *>(pCurr) ); } @@ -1485,7 +1485,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang ); } // if pCurr==NULL the SYSTEM entry is selected - sal_uInt16 nPos = m_pCurrencyLB->GetEntryPos( static_cast<void const *>(pCurr) ); + const sal_Int32 nPos = m_pCurrencyLB->GetEntryPos( static_cast<void const *>(pCurr) ); m_pCurrencyLB->SelectEntryPos( nPos ); bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_CURRENCY); m_pCurrencyLB->Enable(!bReadonly); @@ -1673,7 +1673,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) const NfCurrencyEntry* pCurr = &SvNumberFormatter::GetCurrencyEntry( ((eLang == LANGUAGE_USER_SYSTEM_CONFIG) ? MsLangId::getSystemLanguage() : eLang)); - sal_uInt16 nPos = m_pCurrencyLB->GetEntryPos( nullptr ); + sal_Int32 nPos = m_pCurrencyLB->GetEntryPos( nullptr ); if (pCurr) { // Update the "Default ..." currency. diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index b031e7918bbb..b66a628793a7 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -104,8 +104,8 @@ private: VclPtr<ListBox> m_pMousePosLB; VclPtr<ListBox> m_pMouseMiddleLB; - sal_uInt16 nSizeLB_InitialSelection; - sal_uInt16 nStyleLB_InitialSelection; + sal_Int32 nSizeLB_InitialSelection; + sal_Int32 nStyleLB_InitialSelection; SvtTabAppearanceCfg* pAppearanceCfg; CanvasSettings* pCanvasSettings; diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 1ec65657ccd0..eee1ad2ff536 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -560,7 +560,7 @@ static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties) IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox ) { - sal_uInt16 nCurPos = aDocTypeLB->GetSelectEntryPos(); + const sal_Int32 nCurPos = aDocTypeLB->GetSelectEntryPos(); sal_IntPtr nData = -1; if(nCurPos < APP_COUNT) @@ -588,7 +588,7 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox *, pBox ) OUString sSelect; for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++) { - sal_uInt16 nEntryPos = aSaveAsLB->InsertEntry(pUIFilters[i]); + const sal_Int32 nEntryPos = aSaveAsLB->InsertEntry(pUIFilters[i]); if ( pImpl->aODFArr[nData][i] ) aSaveAsLB->SetEntryData( nEntryPos, static_cast<void*>(pImpl) ); if(pFilters[i] == pImpl->aDefaultArr[nData]) @@ -629,8 +629,8 @@ IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl) if ( bShown ) { bool bHasODFFormat = false; - sal_uInt16 i = 0, nCount = aSaveAsLB->GetEntryCount(); - for ( ; i < nCount; ++ i ) + const sal_Int32 nCount = aSaveAsLB->GetEntryCount(); + for ( sal_Int32 i = 0; i < nCount; ++i ) { if ( aSaveAsLB->GetEntryData(i) != NULL ) { diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 343f42dacc1b..d3fcb3428db7 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -381,7 +381,7 @@ void AlignmentTabPage::InitVsRefEgde() void AlignmentTabPage::UpdateEnableControls() { - sal_uInt16 nHorAlign = m_pLbHorAlign->GetSelectEntryPos(); + const sal_Int32 nHorAlign = m_pLbHorAlign->GetSelectEntryPos(); bool bHorLeft = (nHorAlign == ALIGNDLG_HORALIGN_LEFT); bool bHorBlock = (nHorAlign == ALIGNDLG_HORALIGN_BLOCK); bool bHorFill = (nHorAlign == ALIGNDLG_HORALIGN_FILL); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index f223f9debccd..d51c47b1482b 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2289,13 +2289,13 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) bModified |= nVal != pOpt->nAutoCmpltListLen; pOpt->nAutoCmpltListLen = nVal; - nVal = m_pDCBExpandKey->GetSelectEntryPos(); - if( nVal < m_pDCBExpandKey->GetEntryCount() ) + const sal_Int32 nPos = m_pDCBExpandKey->GetSelectEntryPos(); + if( nPos < m_pDCBExpandKey->GetEntryCount() ) { - sal_uLong nKey = reinterpret_cast<sal_uLong>(m_pDCBExpandKey->GetEntryData( nVal )); + sal_uLong nKey = reinterpret_cast<sal_uLong>(m_pDCBExpandKey->GetEntryData( nPos )); bModified |= nKey != pOpt->nAutoCmpltExpandKey; pOpt->nAutoCmpltExpandKey = (sal_uInt16)nKey; - } + } if (m_pAutoCompleteList && m_nAutoCmpltListCnt != m_pLBEntries->GetEntryCount()) { diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 1e66ff0bc7b3..2c2a725db5d9 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1794,7 +1794,7 @@ void SvxNumberFormatTabPage::SetCategory(sal_uInt16 nPos) void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect) { m_pLbLanguage->RemoveLanguage(LANGUAGE_SYSTEM); - sal_uInt16 nPos = m_pLbLanguage->InsertEntry(sAutomaticEntry); + const sal_Int32 nPos = m_pLbLanguage->InsertEntry(sAutomaticEntry); m_pLbLanguage->SetEntryData(nPos, reinterpret_cast<void*>((sal_uLong)eAutoLang)); if(bSelect) m_pLbLanguage->SelectEntryPos(nPos); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index d1f1e4a95476..1a7d7b0b2761 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -525,7 +525,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) else aBinName = mpDefPrinter->GetPaperBinName( (sal_uInt16)nPaperBin ); - sal_uInt16 nEntryPos = m_pPaperTrayBox->InsertEntry( aBinName ); + const sal_Int32 nEntryPos = m_pPaperTrayBox->InsertEntry( aBinName ); m_pPaperTrayBox->SetEntryData( nEntryPos, reinterpret_cast<void*>((sal_uLong)nPaperBin) ); m_pPaperTrayBox->SelectEntry( aBinName ); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 6bea91f71364..f86314a3155b 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -223,10 +223,10 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) { - sal_uInt16 nCnt = m_pLB_FreeIndexes->GetEntryCount(); + const sal_Int32 nCnt = m_pLB_FreeIndexes->GetEntryCount(); OUString aTableName = m_pCB_Tables->GetText(); - for( sal_uInt16 nPos = 0; nPos < nCnt; ++nPos ) + for( sal_Int32 nPos = 0; nPos < nCnt; ++nPos ) InsertTableIndex( aTableName, RemoveFreeIndex( m_pLB_FreeIndexes->GetEntry(0), true ) ); checkButtons(); @@ -234,10 +234,10 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void ) { - sal_uInt16 nCnt = m_pLB_TableIndexes->GetEntryCount(); + const sal_Int32 nCnt = m_pLB_TableIndexes->GetEntryCount(); OUString aTableName = m_pCB_Tables->GetText(); - for( sal_uInt16 nPos = 0; nPos < nCnt; ++nPos ) + for( sal_Int32 nPos = 0; nPos < nCnt; ++nPos ) InsertFreeIndex( RemoveTableIndex( aTableName, m_pLB_TableIndexes->GetEntry(0), true ) ); checkButtons(); diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 08bc95202364..3ed48c8933eb 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -364,8 +364,8 @@ namespace dbaui void OGeneralPage::insertDatasourceTypeEntryData(const OUString& _sType, const OUString& sDisplayName) { // insert a (temporary) entry - sal_uInt16 nPos = m_pDatasourceType->InsertEntry(sDisplayName); - if ( nPos >= m_aURLPrefixes.size() ) + const sal_Int32 nPos = m_pDatasourceType->InsertEntry(sDisplayName); + if ( static_cast<size_t>(nPos) >= m_aURLPrefixes.size() ) m_aURLPrefixes.resize(nPos+1); m_aURLPrefixes[nPos] = _sType; } @@ -373,8 +373,8 @@ namespace dbaui void OGeneralPageWizard::insertEmbeddedDBTypeEntryData(const OUString& _sType, const OUString& sDisplayName) { // insert a (temporary) entry - sal_uInt16 nPos = m_pEmbeddedDBType->InsertEntry(sDisplayName); - if ( nPos >= m_aEmbeddedURLPrefixes.size() ) + const sal_Int32 nPos = m_pEmbeddedDBType->InsertEntry(sDisplayName); + if ( static_cast<size_t>(nPos) >= m_aEmbeddedURLPrefixes.size() ) m_aEmbeddedURLPrefixes.resize(nPos+1); m_aEmbeddedURLPrefixes[nPos] = _sType; } @@ -409,8 +409,8 @@ namespace dbaui IMPL_LINK( OGeneralPageWizard, OnEmbeddedDBTypeSelected, ListBox*, _pBox ) { // get the type from the entry data - sal_uInt16 nSelected = _pBox->GetSelectEntryPos(); - if (nSelected >= m_aEmbeddedURLPrefixes.size() ) + const sal_Int32 nSelected = _pBox->GetSelectEntryPos(); + if (static_cast<size_t>(nSelected) >= m_aEmbeddedURLPrefixes.size() ) { SAL_WARN("dbaccess.ui.OGeneralPage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix"); return 0L; @@ -429,8 +429,8 @@ namespace dbaui IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox*, _pBox ) { // get the type from the entry data - sal_uInt16 nSelected = _pBox->GetSelectEntryPos(); - if (nSelected >= m_aURLPrefixes.size() ) + const sal_Int32 nSelected = _pBox->GetSelectEntryPos(); + if (static_cast<size_t>(nSelected) >= m_aURLPrefixes.size() ) { SAL_WARN("dbaccess.ui.OGeneralPage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix"); return 0L; @@ -477,7 +477,7 @@ namespace dbaui { bool bChangedSomething = false; - sal_uInt16 nEntry = m_pDatasourceType->GetSelectEntryPos(); + const sal_Int32 nEntry = m_pDatasourceType->GetSelectEntryPos(); OUString sURLPrefix = m_aURLPrefixes[ nEntry ]; if ( m_pDatasourceType->IsValueChangedFromSaved() ) @@ -670,7 +670,7 @@ namespace dbaui if ( bCommitTypeSelection ) { - sal_uInt16 nEntry = m_pDatasourceType->GetSelectEntryPos(); + const sal_Int32 nEntry = m_pDatasourceType->GetSelectEntryPos(); OUString sURLPrefix = m_aURLPrefixes[nEntry]; if ( m_pDatasourceType->IsValueChangedFromSaved() diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index eebe5c15a38d..373b6d0fb568 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -97,8 +97,8 @@ DlgFilterCrit::DlgFilterCrit(vcl::Window * pParent, m_pLB_WHERECOMP1->set_width_request(aSize.Width()); m_pLB_WHERECOMP2->set_width_request(aSize.Width()); m_pLB_WHERECOMP3->set_width_request(aSize.Width()); - sal_uInt16 nEntryCount = m_pLB_WHERECOMP1->GetEntryCount(); - for (sal_uInt16 i = 0; i < nEntryCount; ++i) + const sal_Int32 nEntryCount = m_pLB_WHERECOMP1->GetEntryCount(); + for (sal_Int32 i = 0; i < nEntryCount; ++i) { if (i > 0) m_aSTR_COMPARE_OPERATORS += ";"; @@ -265,9 +265,9 @@ sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredica return nPredicateType; } -sal_uInt16 DlgFilterCrit::GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) +sal_Int32 DlgFilterCrit::GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) { - sal_uInt16 nPos; + sal_Int32 nPos; switch(eType) { case SQLFilterOperator::EQUAL: @@ -570,9 +570,9 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,bool _b void DlgFilterCrit::SelectField( ListBox& rBox, const OUString& rField ) { - sal_uInt16 nCnt = rBox.GetEntryCount(); + const sal_Int32 nCnt = rBox.GetEntryCount(); - for( sal_uInt16 i=0 ; i<nCnt ; i++ ) + for( sal_Int32 i=0 ; i<nCnt ; i++ ) { if(rBox.GetEntry(i) == rField) { diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index a653d9e31950..edf527f2f5b1 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -67,7 +67,7 @@ namespace dbaui void enableButtons(); - sal_uInt16 adjustColumnPosition(ListBox* _pLeft, + sal_Int32 adjustColumnPosition(ListBox* _pLeft, const OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::UStringMixEqual& _aCase); diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index dcc7b792b027..32fb47c0ed38 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -97,7 +97,7 @@ namespace dbaui void SetLine( sal_uInt16 nIdx,const css::beans::PropertyValue& _rItem,bool _bOr ); void EnableLines(); sal_Int32 GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const; - static sal_uInt16 GetSelectionPos(sal_Int32 eType,const ListBox& rListBox); + static sal_Int32 GetSelectionPos(sal_Int32 eType,const ListBox& rListBox); bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,css::beans::PropertyValue& _rFilter) const; void fillLines(const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& _aValues); diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index b0b618882845..7167141f2513 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -128,7 +128,7 @@ void OWizColumnSelect::Reset() for(;aIter != aEnd;++aIter) { - sal_uInt16 nPos = m_pOrgColumnNames->InsertEntry((*aIter)->first); + const sal_Int32 nPos = m_pOrgColumnNames->InsertEntry((*aIter)->first); m_pOrgColumnNames->SetEntryData(nPos,(*aIter)->second); } @@ -152,7 +152,7 @@ void OWizColumnSelect::ActivatePage( ) ODatabaseExport::TColumnVector::const_iterator aEnd = rDestColumns.end(); for(;aIter != aEnd;++aIter) { - sal_uInt16 nPos = m_pNewColumnNames->InsertEntry((*aIter)->first); + const sal_Int32 nPos = m_pNewColumnNames->InsertEntry((*aIter)->first); m_pNewColumnNames->SetEntryData(nPos,new OFieldDescription(*((*aIter)->second))); m_pOrgColumnNames->RemoveEntry((*aIter)->first); } @@ -228,16 +228,16 @@ IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i) moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase); - for(sal_uInt16 j=pLeft->GetSelectEntryCount(); j ; --j) + for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; --j) pLeft->RemoveEntry(pLeft->GetSelectEntry(j-1)); } else { - sal_uInt16 nEntries = pLeft->GetEntryCount(); - for(sal_uInt16 i=0; i < nEntries; ++i) + const sal_Int32 nEntries = pLeft->GetEntryCount(); + for(sal_Int32 i=0; i < nEntries; ++i) moveColumn(pRight,pLeft,aRightColumns,pLeft->GetEntry(i),sExtraChars,nMaxNameLen,aCase); - for(sal_uInt16 j=pLeft->GetEntryCount(); j ; --j) - pLeft->RemoveEntry(j-1); + for(sal_Int32 j=pLeft->GetEntryCount(); j ; ) + pLeft->RemoveEntry(--j); } enableButtons(); @@ -271,8 +271,8 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox *, pListBox ) for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i) moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase); - for(sal_uInt16 j=pLeft->GetSelectEntryCount(); j ; --j) - pLeft->RemoveEntry(pLeft->GetSelectEntry(j-1)); + for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; ) + pLeft->RemoveEntry(pLeft->GetSelectEntry(--j)); enableButtons(); return 0; @@ -287,9 +287,9 @@ void OWizColumnSelect::clearListBox(ListBox& _rListBox) void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< OUString> &_rRightColumns) { - sal_uInt16 nCount = pRight->GetEntryCount(); + const sal_Int32 nCount = pRight->GetEntryCount(); _rRightColumns.reserve(nCount); - for(sal_uInt16 i=0; i < nCount;++i) + for(sal_Int32 i=0; i < nCount; ++i) _rRightColumns.push_back(pRight->GetEntry(i)); } @@ -365,21 +365,21 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, // not enough. We need to take into account what fields have // been removed earlier and adjust accordingly. Based on the // algorithm employed in moveColumn(). -sal_uInt16 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, +sal_Int32 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, const OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::UStringMixEqual& _aCase) { - sal_uInt16 nAdjustedPos = 0; + sal_Int32 nAdjustedPos = 0; // if returning all entries to their original position, // then there is no need to adjust the positions. if (m_pColumns_LH->HasFocus()) return nAdjustedPos; - sal_uInt16 nCount = _pLeft->GetEntryCount(); + const sal_Int32 nCount = _pLeft->GetEntryCount(); OUString sColumnString; - for(sal_uInt16 i=0; i < nCount; ++i) + for(sal_Int32 i=0; i < nCount; ++i) { sColumnString = _pLeft->GetEntry(i); if(_sColumnName != sColumnString) diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index f6d06c99711a..99ba3559970d 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -97,7 +97,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) OFieldDescription* pCurFieldDescr = getCurrentFieldDescData(); - sal_uInt16 nPos = pListBox->GetEntryPos( OUString( pCurFieldDescr->GetName() ) ); + const sal_Int32 nPos = pListBox->GetEntryPos( OUString( pCurFieldDescr->GetName() ) ); pCurFieldDescr = static_cast< OFieldDescription* >( pListBox->GetEntryData( nPos ) ); OSL_ENSURE( pCurFieldDescr, "OWizTypeSelectControl::CellModified: Columnname/type not found in the listbox!" ); if ( !pCurFieldDescr ) @@ -121,8 +121,8 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) if ( getMetaData().is() && !getMetaData()->supportsMixedCaseQuotedIdentifiers() ) { bCase = false; - sal_uInt16 nCount = pListBox->GetEntryCount(); - for (sal_uInt16 i=0 ; !bDoubleName && i < nCount ; ++i) + const sal_Int32 nCount = pListBox->GetEntryCount(); + for (sal_Int32 i=0 ; !bDoubleName && i < nCount ; ++i) { OUString sEntry(pListBox->GetEntry(i)); bDoubleName = sNewName.equalsIgnoreAsciiCase(sEntry); @@ -308,11 +308,9 @@ void OWizTypeSelect::Reset() ODatabaseExport::TColumnVector::const_iterator aEnd = rDestColumns.end(); for(;aIter != aEnd;++aIter) { - sal_uInt16 nPos; - if((*aIter)->second->IsPrimaryKey()) - nPos = m_pColumnNames->InsertEntry((*aIter)->first, m_imgPKey ); - else - nPos = m_pColumnNames->InsertEntry((*aIter)->first); + const sal_Int32 nPos = (*aIter)->second->IsPrimaryKey() + ? m_pColumnNames->InsertEntry((*aIter)->first, m_imgPKey ) + : m_pColumnNames->InsertEntry((*aIter)->first); m_pColumnNames->SetEntryData(nPos,(*aIter)->second); } m_bFirstTime = false; @@ -373,8 +371,8 @@ void OWizTypeSelectList::dispose() bool OWizTypeSelectList::IsPrimaryKeyAllowed() const { - sal_uInt16 nCount = GetSelectEntryCount(); - sal_uInt16 j; + const sal_Int32 nCount = GetSelectEntryCount(); + sal_Int32 j; for( j = 0; m_bPKey && j < nCount; ++j ) { @@ -432,8 +430,8 @@ bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt ) { case SID_TABLEDESIGN_TABED_PRIMARYKEY: { - sal_uInt16 nCount = GetEntryCount(); - for(sal_uInt16 j = 0 ; j < nCount ; ++j) + const sal_Int32 nCount = GetEntryCount(); + for(sal_Int32 j = 0 ; j < nCount ; ++j) { OFieldDescription* pFieldDescr = static_cast<OFieldDescription*>(GetEntryData(j)); if( pFieldDescr ) diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 6d4d2ad386bd..e0a903888cb6 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -122,8 +122,8 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent, } else { - const sal_uInt16 nCount = m_pLB_JoinType->GetEntryCount(); - for (sal_uInt16 i = 0; i < nCount; ++i) + const sal_Int32 nCount = m_pLB_JoinType->GetEntryCount(); + for (sal_Int32 i = 0; i < nCount; ++i) { const sal_IntPtr nJoinTyp = reinterpret_cast<sal_IntPtr>(m_pLB_JoinType->GetEntryData(i)); if ( !bSupportFullJoin && nJoinTyp == ID_FULL_JOIN ) @@ -167,7 +167,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) OUString sSecondWinName = m_pConnData->getReferencedTable()->GetWinName(); const EJoinType eOldJoinType = eJoinType; sal_uInt16 nResId = 0; - const sal_uInt16 nPos = m_pLB_JoinType->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLB_JoinType->GetSelectEntryPos(); const sal_IntPtr nJoinType = reinterpret_cast<sal_IntPtr>(m_pLB_JoinType->GetEntryData(nPos)); bool bAddHint = true; switch ( nJoinType ) @@ -322,8 +322,8 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType) break; } - const sal_uInt16 nCount = m_pLB_JoinType->GetEntryCount(); - for (sal_uInt16 i = 0; i < nCount; ++i) + const sal_Int32 nCount = m_pLB_JoinType->GetEntryCount(); + for (sal_Int32 i = 0; i < nCount; ++i) { if ( nJoinType == reinterpret_cast<sal_IntPtr>(m_pLB_JoinType->GetEntryData(i)) ) { diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 6a6e44d6d273..860ab2dcb297 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -424,7 +424,7 @@ void MappingDialog_Impl::dispose() IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) { - sal_uInt16 nEntryPos = pListBox->GetSelectEntryPos(); + const sal_Int32 nEntryPos = pListBox->GetSelectEntryPos(); if(0 < nEntryPos) { for(sal_uInt16 i = 0; i < COLUMN_COUNT; i++) diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 3cd5c75fb8e8..23edfb922aa4 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -244,10 +244,9 @@ namespace dbp { const OUString* pNames = _rNames.getConstArray(); const OUString* pNamesEnd = _rNames.getConstArray() + _rNames.getLength(); - sal_uInt16 nPos = 0; while ( pNames != pNamesEnd ) { - nPos = _rListBox.InsertEntry( *pNames++, _rImage ); + const sal_Int32 nPos = _rListBox.InsertEntry( *pNames++, _rImage ); _rListBox.SetEntryData( nPos, reinterpret_cast< void* >( _nCommandType ) ); } } diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 480b9ec283b6..98e9f8358012 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -367,12 +367,12 @@ namespace dbp return false; OGridSettings& rSettings = getSettings(); - sal_uInt16 nSelected = m_pSelFields->GetEntryCount(); + const sal_Int32 nSelected = m_pSelFields->GetEntryCount(); rSettings.aSelectedFields.realloc(nSelected); OUString* pSelected = rSettings.aSelectedFields.getArray(); - for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected) + for (sal_Int32 i=0; i<nSelected; ++i, ++pSelected) *pSelected = m_pSelFields->GetEntry(i); return true; @@ -417,7 +417,7 @@ namespace dbp ListBox& rMoveTo = bMoveRight ? *m_pSelFields : *m_pExistFields; // the index of the selected entry - sal_uInt16 nSelected = bMoveRight ? m_pExistFields->GetSelectEntryPos() : m_pSelFields->GetSelectEntryPos(); + const sal_Int32 nSelected = bMoveRight ? m_pExistFields->GetSelectEntryPos() : m_pSelFields->GetSelectEntryPos(); // the (original) relative position of the entry sal_IntPtr nRelativeIndex = reinterpret_cast<sal_IntPtr>(bMoveRight ? m_pExistFields->GetEntryData(nSelected) : m_pSelFields->GetEntryData(nSelected)); diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 9b2bbedcb368..01b113438230 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -132,10 +132,10 @@ namespace pcr void ListSelectionDialog::collectSelection( Sequence< sal_Int16 >& /* [out] */ _rSelection ) { - sal_uInt16 nSelectedCount = m_pEntries->GetSelectEntryCount( ); + const sal_Int32 nSelectedCount = m_pEntries->GetSelectEntryCount( ); _rSelection.realloc( nSelectedCount ); sal_Int16* pSelection = _rSelection.getArray(); - for ( sal_uInt16 selected = 0; selected < nSelectedCount; ++selected, ++pSelection ) + for ( sal_Int32 selected = 0; selected < nSelectedCount; ++selected, ++pSelection ) *pSelection = static_cast< sal_Int16 >( m_pEntries->GetSelectEntryPos( selected ) ); } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index b1c205ef4827..c4276e731899 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -863,10 +863,10 @@ namespace pcr Sequence< OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException, std::exception) { - const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); + const sal_Int32 nCount = getTypedControlWindow()->GetEntryCount(); Sequence< OUString > aRet(nCount); OUString* pIter = aRet.getArray(); - for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) + for (sal_Int32 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); return aRet; @@ -933,10 +933,10 @@ namespace pcr Sequence< OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException, std::exception) { - const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); + const sal_Int32 nCount = getTypedControlWindow()->GetEntryCount(); Sequence< OUString > aRet(nCount); OUString* pIter = aRet.getArray(); - for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) + for (sal_Int32 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); return aRet; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index a03278299529..b30e07807f2a 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -302,7 +302,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl* sName = _pFilterDesc->GetName(); // insert an set user data - sal_uInt16 nPos = _pLbFilter->InsertEntry( sName ); + const sal_Int32 nPos = _pLbFilter->InsertEntry( sName ); _pLbFilter->SetEntryData( nPos, const_cast< void* >( static_cast< const void* >( _pFilterDesc ) ) ); } diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 6acbf7872378..11ddc5fe5e97 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -54,7 +54,7 @@ private: */ std::vector< std::shared_ptr< DetailsContainer > > m_aDetailsContainers; - unsigned int m_nCurrentType; + sal_Int32 m_nCurrentType; bool bLabelChanged; bool m_bShowPassword; diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index a6ab60dd5d05..05982c4eeee9 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -36,7 +36,7 @@ protected: OUString aActionStr; VclPtr<SvxPopupWindowListBox> pPopupWin; - void Impl_SetInfo( sal_uInt16 nCount ); + void Impl_SetInfo( sal_Int32 nCount ); DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); DECL_LINK( SelectHdl, void * ); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 6157ba37a12a..3d9d0b9428c1 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -513,7 +513,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre OUString aName = pStyle->GetName(); if ( rLbStyle.GetEntryPos(aName) == LISTBOX_ENTRY_NOTFOUND ) // all lists contain the same entries { - for( sal_uInt16 i = 1, n = rLbStyle.GetEntryCount(); i <= n && !bFound; ++i) + for( sal_Int32 i = 1, n = rLbStyle.GetEntryCount(); i <= n && !bFound; ++i) { OUString aStyleName = ScGlobal::pCharClass->uppercase(OUString(rLbStyle.GetEntry(i))); if( i == n ) diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index c2cafd34d345..1977ee8d3425 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -365,7 +365,7 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void) { - sal_uInt16 nDataAreaCount = pLbConsAreas->GetEntryCount(); + const sal_Int32 nDataAreaCount = pLbConsAreas->GetEntryCount(); if ( nDataAreaCount > 0 ) { @@ -379,9 +379,8 @@ IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void) ScConsolidateParam theOutParam( theConsData ); ScArea** ppDataAreas = new ScArea*[nDataAreaCount]; ScArea* pArea; - sal_uInt16 i=0; - for ( i=0; i<nDataAreaCount; i++ ) + for ( sal_Int32 i=0; i<nDataAreaCount; ++i ) { pArea = new ScArea; ScRangeUtil::MakeArea( pLbConsAreas->GetEntry( i ), @@ -398,7 +397,7 @@ IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void) theOutParam.bReferenceData = pBtnRefs->IsChecked(); theOutParam.SetAreas( ppDataAreas, nDataAreaCount ); - for ( i=0; i<nDataAreaCount; i++ ) + for ( sal_Int32 i=0; i<nDataAreaCount; ++i ) delete ppDataAreas[i]; delete [] ppDataAreas; @@ -497,7 +496,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) else if ( (pLb == pLbDataArea) || (pLb == pLbDestArea) ) { Edit* pEd = (pLb == pLbDataArea) ? pEdDataArea : pEdDestArea; - sal_uInt16 nSelPos = pLb->GetSelectEntryPos(); + const sal_Int32 nSelPos = pLb->GetSelectEntryPos(); if ( pRangeUtil && (nSelPos > 0) @@ -550,7 +549,7 @@ IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) // Resource of the ListBox and these two conversion methods are also in // tpsubt and everywhere, where StarCalc functions are selectable. -ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( sal_uInt16 nPos ) +ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( sal_Int32 nPos ) { switch ( nPos ) { @@ -570,7 +569,7 @@ ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( sal_uInt16 nPos ) } } -sal_uInt16 ScConsolidateDlg::FuncToLbPos( ScSubTotalFunc eFunc ) +sal_Int32 ScConsolidateDlg::FuncToLbPos( ScSubTotalFunc eFunc ) { switch ( eFunc ) { diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 7120f84a2222..27d027d57a14 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -221,9 +221,9 @@ void ScCsvTableBox::SetUniStrings( void ScCsvTableBox::InitTypes( const ListBox& rListBox ) { - sal_uInt16 nTypeCount = rListBox.GetEntryCount(); + const sal_Int32 nTypeCount = rListBox.GetEntryCount(); StringVec aTypeNames( nTypeCount ); - for( sal_uInt16 nIndex = 0; nIndex < nTypeCount; ++nIndex ) + for( sal_Int32 nIndex = 0; nIndex < nTypeCount; ++nIndex ) aTypeNames[ nIndex ] = rListBox.GetEntry( nIndex ); maGrid->SetTypeNames( aTypeNames ); } diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index dd39bf05d290..93bcce13684c 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -97,7 +97,7 @@ void ScDataPilotDatabaseDlg::dispose() void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc ) { - sal_uInt16 nSelect = m_pLbType->GetSelectEntryPos(); + const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos(); rDesc.aDBName = m_pLbDatabase->GetSelectEntry(); rDesc.aObject = m_pCbObject->GetText(); @@ -128,7 +128,7 @@ void ScDataPilotDatabaseDlg::FillObjects() if (aDatabaseName.isEmpty()) return; - sal_uInt16 nSelect = m_pLbType->GetSelectEntryPos(); + const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos(); if ( nSelect > DP_TYPELIST_QUERY ) return; // only tables and queries diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index b920e3a0a9a0..3621607736e5 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -83,7 +83,7 @@ bool ScDataPilotSourceTypeDlg::IsNamedRange() const OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const { - sal_uInt16 nPos = m_pLbNamedRange->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLbNamedRange->GetSelectEntryPos(); return m_pLbNamedRange->GetEntry(nPos); } diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index e1dc6a56e9a5..2771e0acc7eb 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -504,14 +504,13 @@ void ScFilterDlg::UpdateValueList( size_t nList ) if (pDoc && nList > 0 && nList <= QUERY_ENTRY_COUNT) { ComboBox* pValList = maValueEdArr[nList-1]; - sal_uInt16 nFieldSelPos = maFieldLbArr[nList-1]->GetSelectEntryPos(); - sal_uInt16 nListPos = 0; + const sal_Int32 nFieldSelPos = maFieldLbArr[nList-1]->GetSelectEntryPos(); + sal_Int32 nListPos = 0; OUString aCurValue = pValList->GetText(); pValList->Clear(); - pValList->InsertEntry( aStrNotEmpty, 0 ); - pValList->InsertEntry( aStrEmpty, 1 ); - nListPos = 2; + pValList->InsertEntry( aStrNotEmpty, nListPos++ ); + pValList->InsertEntry( aStrEmpty, nListPos++ ); if ( nFieldSelPos ) { @@ -580,8 +579,7 @@ void ScFilterDlg::UpdateValueList( size_t nList ) std::vector<ScTypedStrData>::const_iterator it = pList->maList.begin(), itEnd = pList->maList.end(); for (; it != itEnd; ++it) { - pValList->InsertEntry(it->GetString(), nListPos); - nListPos++; + pValList->InsertEntry(it->GetString(), nListPos++); } } pValList->SetText( aCurValue ); @@ -780,7 +778,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) pLbCond1->Enable(); pEdVal1->Enable(); - sal_uInt16 nConnect1 = pLbConnect1->GetSelectEntryPos(); + const sal_Int32 nConnect1 = pLbConnect1->GetSelectEntryPos(); size_t nQE = nOffset; theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect1; if (maRefreshExceptQuery.size() < nQE + 1) @@ -794,7 +792,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) pLbCond2->Enable(); pEdVal2->Enable(); - sal_uInt16 nConnect2 = pLbConnect2->GetSelectEntryPos(); + const sal_Int32 nConnect2 = pLbConnect2->GetSelectEntryPos(); size_t nQE = 1+nOffset; theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect2; if (maRefreshExceptQuery.size() < nQE + 1) @@ -807,7 +805,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) pLbCond3->Enable(); pEdVal3->Enable(); - sal_uInt16 nConnect3 = pLbConnect3->GetSelectEntryPos(); + const sal_Int32 nConnect3 = pLbConnect3->GetSelectEntryPos(); size_t nQE = 2 + nOffset; theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect3; if (maRefreshExceptQuery.size() < nQE + 1) @@ -821,7 +819,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) pLbCond4->Enable(); pEdVal4->Enable(); - sal_uInt16 nConnect4 = pLbConnect4->GetSelectEntryPos(); + const sal_Int32 nConnect4 = pLbConnect4->GetSelectEntryPos(); size_t nQE = 3 + nOffset; theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect4; if (maRefreshExceptQuery.size() < nQE + 1) @@ -877,7 +875,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) pLbConnect2->Enable(); } theQueryData.GetEntry(nOffset).bDoQuery = true; - sal_uInt16 nField = pLb->GetSelectEntryPos(); + const sal_Int32 nField = pLb->GetSelectEntryPos(); theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; } } @@ -923,7 +921,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { pLbConnect3->Enable(); } - sal_uInt16 nField = pLb->GetSelectEntryPos(); + const sal_Int32 nField = pLb->GetSelectEntryPos(); sal_uInt16 nQ=1+nOffset; theQueryData.GetEntry(nQ).bDoQuery = true; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -964,7 +962,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) pLbConnect4->Enable(); } - sal_uInt16 nField = pLb->GetSelectEntryPos(); + const sal_Int32 nField = pLb->GetSelectEntryPos(); sal_uInt16 nQ=2+nOffset; theQueryData.GetEntry(nQ).bDoQuery = true; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -991,7 +989,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) else { UpdateValueList( 4 ); - sal_uInt16 nField = pLb->GetSelectEntryPos(); + const sal_Int32 nField = pLb->GetSelectEntryPos(); sal_uInt16 nQ=3+nOffset; theQueryData.GetEntry(nQ).bDoQuery = true; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -1031,10 +1029,10 @@ IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) if ( pBox == pBtnHeader ) // Field list and value list { - sal_uInt16 nCurSel1 = pLbField1->GetSelectEntryPos(); - sal_uInt16 nCurSel2 = pLbField2->GetSelectEntryPos(); - sal_uInt16 nCurSel3 = pLbField3->GetSelectEntryPos(); - sal_uInt16 nCurSel4 = pLbField4->GetSelectEntryPos(); + const sal_Int32 nCurSel1 = pLbField1->GetSelectEntryPos(); + const sal_Int32 nCurSel2 = pLbField2->GetSelectEntryPos(); + const sal_Int32 nCurSel3 = pLbField3->GetSelectEntryPos(); + const sal_Int32 nCurSel4 = pLbField4->GetSelectEntryPos(); FillFieldLists(); pLbField1->SelectEntryPos( nCurSel1 ); pLbField2->SelectEntryPos( nCurSel2 ); @@ -1131,7 +1129,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString; } - sal_uInt16 nField = pLbField->GetSelectEntryPos(); + const sal_Int32 nField = pLbField->GetSelectEntryPos(); rEntry.nField = nField ? (theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index d50c7a9232c2..b4a49fadcb99 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -68,10 +68,9 @@ ScFilterOptionsMgr::ScFilterOptionsMgr( ScFilterOptionsMgr::~ScFilterOptionsMgr() { - sal_uInt16 nEntries = pLbCopyArea->GetEntryCount(); - sal_uInt16 i; + const sal_Int32 nEntries = pLbCopyArea->GetEntryCount(); - for ( i=2; i<nEntries; i++ ) + for ( sal_Int32 i=2; i<nEntries; i++ ) delete static_cast<OUString*>(pLbCopyArea->GetEntryData( i )); } @@ -115,7 +114,7 @@ void ScFilterOptionsMgr::Init() ScRange aRange; while ( aIter.Next( aName, aRange ) ) { - sal_uInt16 nInsert = pLbCopyArea->InsertEntry( aName ); + const sal_Int32 nInsert = pLbCopyArea->InsertEntry( aName ); OUString aRefStr(aRange.aStart.Format(SCA_ABS_3D, pDoc, eConv)); pLbCopyArea->SetEntryData( nInsert, new OUString( aRefStr ) ); @@ -215,7 +214,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) if ( pLb == pLbCopyArea ) { OUString aString; - sal_uInt16 nSelPos = pLbCopyArea->GetSelectEntryPos(); + const sal_Int32 nSelPos = pLbCopyArea->GetSelectEntryPos(); if ( nSelPos > 0 ) aString = *static_cast<OUString*>(pLbCopyArea->GetEntryData( nSelPos )); @@ -236,8 +235,8 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) if ( SCA_VALID == (nResult & SCA_VALID) ) { bool bFound = false; - sal_uInt16 i = 0; - sal_uInt16 nCount = pLbCopyArea->GetEntryCount(); + sal_Int32 i = 0; + const sal_Int32 nCount = pLbCopyArea->GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index f2ed203c05e7..87de436830eb 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -367,7 +367,7 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() for ( SCSIZE i=0; i<3; i++ ) { - sal_uInt16 nField = aFieldLbArr[i]->GetSelectEntryPos(); + const sal_Int32 nField = aFieldLbArr[i]->GetSelectEntryPos(); ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos(); bool bDoThis = (aFieldLbArr[i]->GetSelectEntryPos() != 0); diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 237ab594606d..bbc88e021aa3 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -103,10 +103,9 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg() void ScSpecialFilterDlg::dispose() { - sal_uInt16 nEntries = pLbFilterArea->GetEntryCount(); - sal_uInt16 i; + const sal_Int32 nEntries = pLbFilterArea->GetEntryCount(); - for ( i=1; i<nEntries; i++ ) + for ( sal_Int32 i=1; i<nEntries; ++i ) delete static_cast<OUString*>(pLbFilterArea->GetEntryData( i )); delete pOptionsMgr; @@ -164,13 +163,12 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) if (!pRangeNames->empty()) { ScRangeName::const_iterator itr = pRangeNames->begin(), itrEnd = pRangeNames->end(); - sal_uInt16 nInsert = 0; for (; itr != itrEnd; ++itr) { if (!itr->second->HasType(RT_CRITERIA)) continue; - nInsert = pLbFilterArea->InsertEntry(itr->second->GetName()); + const sal_Int32 nInsert = pLbFilterArea->InsertEntry(itr->second->GetName()); OUString aSymbol; itr->second->GetSymbol(aSymbol); pLbFilterArea->SetEntryData(nInsert, new OUString(aSymbol)); @@ -432,7 +430,7 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) if ( pLb == pLbFilterArea ) { OUString aString; - sal_uInt16 nSelPos = pLbFilterArea->GetSelectEntryPos(); + const sal_Int32 nSelPos = pLbFilterArea->GetSelectEntryPos(); if ( nSelPos > 0 ) aString = *static_cast<OUString*>(pLbFilterArea->GetEntryData( nSelPos )); @@ -455,8 +453,8 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) if ( SCA_VALID == (nResult & SCA_VALID) ) { bool bFound = false; - sal_uInt16 i = 0; - sal_uInt16 nCount = pLbFilterArea->GetEntryCount(); + sal_Int32 i = 0; + const sal_Int32 nCount = pLbFilterArea->GetEntryCount(); for ( i=1; i<nCount && !bFound; i++ ) { diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 176651486f3d..b5ef0b344c33 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -530,9 +530,9 @@ ScTabPageSortOptions::~ScTabPageSortOptions() void ScTabPageSortOptions::dispose() { - sal_uInt16 nEntries = m_pLbOutPos->GetEntryCount(); + const sal_Int32 nEntries = m_pLbOutPos->GetEntryCount(); - for ( sal_uInt16 i=1; i<nEntries; i++ ) + for ( sal_Int32 i=1; i<nEntries; ++i ) delete static_cast<OUString*>(m_pLbOutPos->GetEntryData( i )); delete pColRes; @@ -594,7 +594,7 @@ void ScTabPageSortOptions::Init() ScRange aRange; while ( aIter.Next( aName, aRange ) ) { - sal_uInt16 nInsert = m_pLbOutPos->InsertEntry( aName ); + const sal_Int32 nInsert = m_pLbOutPos->InsertEntry( aName ); OUString aRefStr(aRange.aStart.Format(SCA_ABS_3D, pDoc, eConv)); m_pLbOutPos->SetEntryData( nInsert, new OUString( aRefStr ) ); @@ -746,7 +746,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet ) { uno::Sequence<OUString> aAlgos = pColWrap->listCollatorAlgorithms( aNewSortData.aCollatorLocale ); - sal_uInt16 nSel = m_pLbAlgorithm->GetSelectEntryPos(); + const sal_Int32 nSel = m_pLbAlgorithm->GetSelectEntryPos(); if ( nSel < aAlgos.getLength() ) sAlg = aAlgos[nSel]; } @@ -881,7 +881,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) if (pLb == m_pLbOutPos) { OUString aString; - sal_uInt16 nSelPos = m_pLbOutPos->GetSelectEntryPos(); + const sal_Int32 nSelPos = m_pLbOutPos->GetSelectEntryPos(); if ( nSelPos > 0 ) aString = *static_cast<OUString*>(m_pLbOutPos->GetEntryData( nSelPos )); @@ -913,8 +913,8 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) if ( SCA_VALID == (nResult & SCA_VALID) ) { bool bFound = false; - sal_uInt16 i = 0; - sal_uInt16 nCount = m_pLbOutPos->GetEntryCount(); + sal_Int32 i = 0; + const sal_Int32 nCount = m_pLbOutPos->GetEntryCount(); for ( i=2; i<nCount && !bFound; i++ ) { diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index da4afa5c006e..04c1de102261 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -199,9 +199,9 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, std::unique_ptr<ScSubTotalFunc[]> pFunctions; std::unique_ptr<SCCOL[]> pSubTotals; - sal_uInt16 nGroup = mpLbGroup->GetSelectEntryPos(); - sal_uInt16 nEntryCount = (sal_uInt16)mpLbColumns->GetEntryCount(); - sal_uInt16 nCheckCount = mpLbColumns->GetCheckedEntryCount(); + const sal_Int32 nGroup = mpLbGroup->GetSelectEntryPos(); + const sal_Int32 nEntryCount = mpLbColumns->GetEntryCount(); + const sal_Int32 nCheckCount = mpLbColumns->GetCheckedEntryCount(); theSubTotalData.nCol1 = rSubTotalData.nCol1; theSubTotalData.nRow1 = rSubTotalData.nRow1; @@ -219,7 +219,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, pSubTotals.reset(new SCCOL [nCheckCount]); pFunctions.reset(new ScSubTotalFunc [nCheckCount]); - for ( sal_uInt16 i=0, nCheck=0; i<nEntryCount; i++ ) + for ( sal_Int32 i=0, nCheck=0; i<nEntryCount; i++ ) { if ( mpLbColumns->IsChecked( i ) ) { @@ -351,8 +351,8 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb ) if ( (mpLbColumns->GetEntryCount() > 0) && (mpLbColumns->GetSelectionCount() > 0) ) { - sal_uInt16 nFunction = mpLbFunctions->GetSelectEntryPos(); - sal_uInt16 nColumn = mpLbColumns->GetSelectEntryPos(); + const sal_Int32 nFunction = mpLbFunctions->GetSelectEntryPos(); + const sal_Int32 nColumn = mpLbColumns->GetSelectEntryPos(); sal_uInt16* pFunction = static_cast<sal_uInt16*>(mpLbColumns->GetEntryData( nColumn )); OSL_ENSURE( pFunction, "EntryData not found!" ); @@ -365,7 +365,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb ) } else if ( pLb == mpLbFunctions ) { - *pFunction = nFunction; + *pFunction = static_cast<sal_uInt16>(nFunction); mpLbColumns->CheckEntryPos( nColumn ); } } diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 196223bbca1d..2262955ce46e 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -578,7 +578,7 @@ void ScTPValidationValue::RemoveRefDlg() IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl) { - sal_uInt16 nPos=m_pLbAllow->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLbAllow->GetSelectEntryPos(); if ( nPos == SC_VALIDDLG_ALLOW_RANGE ) { @@ -603,7 +603,7 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, vcl::Window *, pWnd ) IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl) { - sal_uInt16 nLbPos = m_pLbAllow->GetSelectEntryPos(); + const sal_Int32 nLbPos = m_pLbAllow->GetSelectEntryPos(); bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY); bool bRange = (nLbPos == SC_VALIDDLG_ALLOW_RANGE); bool bList = (nLbPos == SC_VALIDDLG_ALLOW_LIST); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index ec532f370422..2bdf95278847 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -97,8 +97,8 @@ private: DECL_LINK( ModifyHdl, formula::RefEdit* ); DECL_LINK( SelectHdl, ListBox* ); - static ScSubTotalFunc LbPosToFunc( sal_uInt16 nPos ); - static sal_uInt16 FuncToLbPos( ScSubTotalFunc eFunc ); + static ScSubTotalFunc LbPosToFunc( sal_Int32 nPos ); + static sal_Int32 FuncToLbPos( ScSubTotalFunc eFunc ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_CONSDLG_HXX diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index fa24392796b8..54faeabe0fab 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -354,7 +354,6 @@ void ScColRowNameRangesDlg::UpdateNames() pEdAssign->SetText( EMPTY_OUSTRING ); size_t nCount, j; - sal_uInt16 nPos; //@008 inserted auxiliary variable q SCCOL nCol1; SCROW nRow1; //Extension for range names @@ -371,7 +370,7 @@ void ScColRowNameRangesDlg::UpdateNames() aString = strDelim; aString += ScGlobal::GetRscString( STR_COLUMN ); aString += strDelim; - nPos = pLbRange->InsertEntry( aString ); + sal_Int32 nPos = pLbRange->InsertEntry( aString ); pLbRange->SetEntryData( nPos, reinterpret_cast<void*>(nEntryDataDelim) ); if ( (nCount = xColNameRanges->size()) > 0 ) { @@ -580,7 +579,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) { OUString aRangeStr = pLbRange->GetSelectEntry(); - sal_uInt16 nSelectPos = pLbRange->GetSelectEntryPos(); + sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); bool bColName = (reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol); NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr); @@ -611,7 +610,7 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) delete pPair; UpdateNames(); - sal_uInt16 nCnt = pLbRange->GetEntryCount(); + const sal_Int32 nCnt = pLbRange->GetEntryCount(); if ( nSelectPos >= nCnt ) { if ( nCnt ) @@ -640,8 +639,8 @@ IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) // handler called when a row in the listbox is selected, updates form input fields IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl) { - sal_uInt16 nSelectPos = pLbRange->GetSelectEntryPos(); - sal_uInt16 nCnt = pLbRange->GetEntryCount(); + sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); + const sal_Int32 nCnt = pLbRange->GetEntryCount(); sal_uInt16 nMoves = 0; while ( nSelectPos < nCnt && reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataDelim ) diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 246cac6e3a0c..d5f5b01fee4d 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -331,8 +331,8 @@ OUString ScLinkedAreaDlg::GetOptions() OUString ScLinkedAreaDlg::GetSource() { OUStringBuffer aBuf; - sal_uInt16 nCount = m_pLbRanges->GetSelectEntryCount(); - for (sal_uInt16 i=0; i<nCount; i++) + const sal_Int32 nCount = m_pLbRanges->GetSelectEntryCount(); + for (sal_Int32 i=0; i<nCount; ++i) { if (i > 0) aBuf.append(';'); diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 6c9f4a925d5d..5f25f2ec121c 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -162,7 +162,7 @@ void ScMoveTableDlg::CheckNewTabName() bool bMoveInCurrentDoc = (pBtnMove->IsChecked() && IsCurrentDocSelected()); bool bFound = false; - sal_uInt16 nLast = pLbTable->GetEntryCount() - 1; + const sal_Int32 nLast = pLbTable->GetEntryCount() - 1; for ( sal_uInt16 i=0; i<=nLast && !bFound; ++i ) { if ( aNewName.equals(pLbTable->GetEntry(i)) ) @@ -263,10 +263,10 @@ IMPL_LINK_TYPED( ScMoveTableDlg, CheckBtnHdl, RadioButton&, rBtn, void ) IMPL_LINK_NOARG_TYPED(ScMoveTableDlg, OkHdl, Button*, void) { - sal_uInt16 nDocSel = pLbDoc->GetSelectEntryPos(); - sal_uInt16 nDocLast = pLbDoc->GetEntryCount()-1; - sal_uInt16 nTabSel = pLbTable->GetSelectEntryPos(); - sal_uInt16 nTabLast = pLbTable->GetEntryCount()-1; + const sal_Int32 nDocSel = pLbDoc->GetSelectEntryPos(); + const sal_Int32 nDocLast = pLbDoc->GetEntryCount()-1; + const sal_Int32 nTabSel = pLbTable->GetSelectEntryPos(); + const sal_Int32 nTabLast = pLbTable->GetEntryCount()-1; nDocument = (nDocSel != nDocLast) ? nDocSel : SC_DOC_NEW; nTable = (nTabSel != nTabLast) ? static_cast<SCTAB>(nTabSel) : SC_TAB_APPEND; diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index c6ed2a3a5d2d..e01a7a9fef0c 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -363,7 +363,7 @@ IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListB IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl) { - sal_uInt16 nSelectPos = m_pLbEngine->GetSelectEntryPos(); + const sal_Int32 nSelectPos = m_pLbEngine->GetSelectEntryPos(); if ( nSelectPos < maImplNames.getLength() ) { OUString aNewEngine( maImplNames[nSelectPos] ); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 8c69bb17d017..4511ce716664 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -246,7 +246,7 @@ SfxTabPage::sfxpg ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb ) { - sal_uInt16 nSelPos = pLb->GetSelectEntryPos(); + const sal_Int32 nSelPos = pLb->GetSelectEntryPos(); ScVObjMode eMode = ScVObjMode(nSelPos); ScVObjType eType = VOBJ_TYPE_OLE; diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index c2095e176a75..3b20cd717f20 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -40,14 +40,18 @@ // STATIC DATA --------------------------------------------------------------- // List box positions for print range (PR) -const sal_uInt16 SC_AREASDLG_PR_ENTIRE = 1; -const sal_uInt16 SC_AREASDLG_PR_USER = 2; -const sal_uInt16 SC_AREASDLG_PR_SELECT = 3; +enum { + SC_AREASDLG_PR_ENTIRE = 1, + SC_AREASDLG_PR_USER = 2, + SC_AREASDLG_PR_SELECT = 3 +}; // List box positions for repeat ranges (RR) -const sal_uInt16 SC_AREASDLG_RR_NONE = 0; -const sal_uInt16 SC_AREASDLG_RR_USER = 1; -const sal_uInt16 SC_AREASDLG_RR_OFFSET = 2; +enum { + SC_AREASDLG_RR_NONE = 0, + SC_AREASDLG_RR_USER = 1, + SC_AREASDLG_RR_OFFSET = 2 +}; #define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) #define ERRORBOX(nId) ScopedVclPtrInstance<MessageDialog>::Create(this, ScGlobal::GetRscString(nId))->Execute() @@ -146,8 +150,8 @@ void ScPrintAreasDlg::dispose() for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aLb); ++i) { - sal_uInt16 nCount = aLb[i]->GetEntryCount(); - for ( sal_uInt16 j=0; j<nCount; j++ ) + const sal_Int32 nCount = aLb[i]->GetEntryCount(); + for ( sal_Int32 j=0; j<nCount; j++ ) delete static_cast<OUString*>(aLb[i]->GetEntryData(j)); } pLbPrintArea.clear(); @@ -539,13 +543,13 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) { - sal_uInt16 nSelPos = pLb->GetSelectEntryPos(); + const sal_Int32 nSelPos = pLb->GetSelectEntryPos(); Edit* pEd = NULL; // list box positions of specific entries, default to "repeat row/column" list boxes - sal_uInt16 nAllSheetPos = SC_AREASDLG_RR_NONE; - sal_uInt16 nUserDefPos = SC_AREASDLG_RR_USER; - sal_uInt16 nFirstCustomPos = SC_AREASDLG_RR_OFFSET; + sal_Int32 nAllSheetPos = SC_AREASDLG_RR_NONE; + sal_Int32 nUserDefPos = SC_AREASDLG_RR_USER; + sal_Int32 nFirstCustomPos = SC_AREASDLG_RR_OFFSET; // find edit field for list box, and list box positions if( pLb == pLbPrintArea ) @@ -578,8 +582,8 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) ListBox* pLb = NULL; // list box positions of specific entries, default to "repeat row/column" list boxes - sal_uInt16 nUserDefPos = SC_AREASDLG_RR_USER; - sal_uInt16 nFirstCustomPos = SC_AREASDLG_RR_OFFSET; + sal_Int32 nUserDefPos = SC_AREASDLG_RR_USER; + sal_Int32 nFirstCustomPos = SC_AREASDLG_RR_OFFSET; if( pEd == pEdPrintArea ) { @@ -595,7 +599,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) return 0; // set list box selection according to edit field - sal_uInt16 nEntryCount = pLb->GetEntryCount(); + const sal_Int32 nEntryCount = pLb->GetEntryCount(); OUString aStrEd( pEd->GetText() ); OUString aEdUpper = aStrEd.toAsciiUpperCase(); diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 38dd1ce3835e..ccd9167799ad 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -304,7 +304,7 @@ void ScHFEditPage::InitPreDefinedList() void ScHFEditPage::InsertToDefinedList() { - sal_uInt16 nCount = m_pLbDefined->GetEntryCount(); + const sal_Int32 nCount = m_pLbDefined->GetEntryCount(); if(nCount == eEntryCount) { m_pLbDefined->InsertEntry( m_pFtCustomized->GetText() ); @@ -314,7 +314,7 @@ void ScHFEditPage::InsertToDefinedList() void ScHFEditPage::RemoveFromDefinedList() { - sal_uInt16 nCount = m_pLbDefined->GetEntryCount(); + const sal_Int32 nCount = m_pLbDefined->GetEntryCount(); if(nCount > eEntryCount ) m_pLbDefined->RemoveEntry( nCount-1); } @@ -341,9 +341,8 @@ void ScHFEditPage::SetSelectDefinedList() bool bFound = false; - sal_uInt16 i; - sal_uInt16 nCount = m_pLbDefined->GetEntryCount(); - for(i = 0; i < nCount && !bFound; i++) + const sal_Int32 nCount = m_pLbDefined->GetEntryCount(); + for(sal_Int32 i = 0; i < nCount && !bFound; ++i) { switch(static_cast<ScHFEntryId>(i)) { diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 25ad6a570091..00b87c7b68b1 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -108,7 +108,7 @@ void NumberFormatPropertyPanel::Initialize() IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox ) { - sal_uInt16 nVal = pBox->GetSelectEntryPos(); + const sal_Int32 nVal = pBox->GetSelectEntryPos(); if( nVal != mnCategorySelected ) { SfxUInt16Item aItem( SID_NUMBER_TYPE_FORMAT, nVal ); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 7a024e078fc0..0a9545936606 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -78,7 +78,7 @@ private: ::sfx2::sidebar::ControllerItem maNumFormatControl; ::sfx2::sidebar::ControllerItem maFormatControl; - sal_uInt16 mnCategorySelected; + sal_Int32 mnCategorySelected; css::uno::Reference<css::frame::XFrame> mxFrame; ::sfx2::sidebar::EnumContext maContext; diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 0e265f90630c..436f569414ed 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -819,9 +819,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if( pDlg->Execute() == RET_OK ) { - sal_uInt16 nSelCount = pDlg->GetSelectEntryCount(); - sal_uInt16 nSelIx; - for( nSelIx = 0; nSelIx < nSelCount; ++nSelIx ) + const sal_Int32 nSelCount = pDlg->GetSelectEntryCount(); + for( sal_Int32 nSelIx = 0; nSelIx < nSelCount; ++nSelIx ) aIndexList.insert( aIndexList.begin()+nSelIx, pDlg->GetSelectEntryPos( nSelIx ) ); pDlg.reset(); rReq.AppendItem( SfxIntegerListItem( SID_SELECT_TABLES, aIndexList ) ); diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index a2ca5bb669d6..337531d58077 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -149,8 +149,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if ( pDlg->Execute() == RET_OK ) { - sal_uInt16 nCount = pDlg->GetSelectEntryCount(); - for (sal_uInt16 nPos=0; nPos<nCount; nPos++) + const sal_Int32 nCount = pDlg->GetSelectEntryCount(); + for (sal_Int32 nPos=0; nPos<nCount; ++nPos) { aName = pDlg->GetSelectEntry(nPos); rReq.AppendItem( SfxStringItem( FID_TABLE_SHOW, aName ) ); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 22e011986f11..e7bbc92c5e0b 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -961,7 +961,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void ) if(pPage1_Designs->GetSelectEntryCount() == 0) pPage1_Designs->SelectEntryPos(0); - sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); + const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = &m_aDesignList[nPos]; DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)"); @@ -973,7 +973,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void ) // Clickhandler for the choice of one design IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl) { - sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); + const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = &m_aDesignList[nPos]; DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)"); @@ -988,7 +988,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl) // Clickhandler for the delete of one design IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void) { - sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); + const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos(); boost::ptr_vector<SdPublishingDesign>::iterator iter = m_aDesignList.begin()+nPos; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 9e60afde537e..a4a6bbb6efee 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1897,8 +1897,7 @@ void CustomAnimationPane::onChangeStart() if( mpLBStart->GetSelectEntryCount() == 1 ) { sal_Int16 nNodeType; - sal_uInt16 nPos= mpLBStart->GetSelectEntryPos(); - switch( nPos ) + switch( mpLBStart->GetSelectEntryPos() ) { case 0: nNodeType = EffectNodeType::ON_CLICK; break; case 1: nNodeType = EffectNodeType::WITH_PREVIOUS; break; @@ -1983,9 +1982,7 @@ void CustomAnimationPane::onChangeSpeed() double fDuration; - sal_uInt16 nPos= mpCBSpeed->GetSelectEntryPos(); - - switch( nPos ) + switch( mpCBSpeed->GetSelectEntryPos() ) { case 0: fDuration = 5.0; break; case 1: fDuration = 3.0; break; diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 0c9838a5cfdf..b77e49f675a8 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -117,7 +117,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) Reference< graphic::XGraphicProvider> xProvider(graphic::GraphicProvider::create(xContext)); // get the option - sal_uInt16 nOpt = pInsTypeCombo->GetSelectEntryPos(); + const sal_Int32 nOpt = pInsTypeCombo->GetSelectEntryPos(); if ( nOpt == ONE_IMAGE ) { OUString sUrl; @@ -514,7 +514,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void) if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND && pImagesLst->GetSelectEntryPos() != 0) { - sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos(); + const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos(); OUString sActEntry( pImagesLst->GetEntry(nActPos) ); // actual data OUString* pActData = static_cast<OUString*>(pImagesLst->GetEntryData(nActPos)); @@ -542,7 +542,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void) IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, DownHdl, Button*, void) { - sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos(); + const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos(); if (!pImagesLst->GetEntry(nActPos + 1).isEmpty()) { OUString sActEntry( pImagesLst->GetSelectEntry() ); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 5c848a1858fd..0ac1b70c77eb 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -965,7 +965,7 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument() if( mpPage5PageListCT->IsPageChecked(nPgAbsNum) ) { mpPage3EffectLB->applySelected(pPage); - const sal_uInt16 nPos = mpPage3SpeedLB->GetSelectEntryPos(); + const sal_Int32 nPos = mpPage3SpeedLB->GetSelectEntryPos(); pPage->setTransitionDuration( (nPos == 0) ? 3.0 : (nPos == 1) ? 2.0 : 1.0 ); if(bKiosk) { @@ -1755,7 +1755,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl2) INetURLObject aURL; aURL.SetSmartURL(aFileToOpen); mpImpl->maOpenFilesList.push_back (aURL.GetMainURL(INetURLObject::NO_DECODE)); - sal_uInt16 nNewPos = mpImpl->mpPage1OpenLB->InsertEntry(aURL.getName()); + const sal_Int32 nNewPos = mpImpl->mpPage1OpenLB->InsertEntry(aURL.getName()); mpImpl->mpPage1OpenLB->SelectEntryPos(nNewPos); } } diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index ed3c009ebc5c..9137f37d3388 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -86,9 +86,9 @@ VCL_BUILDER_DECL_FACTORY(FadeEffectLB) void FadeEffectLB::applySelected( SdPage* pSlide ) const { - const sal_uInt16 nPos = GetSelectEntryPos(); + const sal_Int32 nPos = GetSelectEntryPos(); - if( pSlide && (nPos < mpImpl->maPresets.size() ) ) + if( pSlide && (static_cast<size_t>(nPos) < mpImpl->maPresets.size() ) ) { TransitionPresetPtr pPreset( mpImpl->maPresets[nPos] ); diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 9a9c382e4412..8b22fd2d6bd4 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -499,7 +499,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat ) OUString aStr( SvxDateTimeField::GetFormatted( aDate, aTime, nDateTimeFormats[nFormat], *(SD_MOD()->GetNumberFormatter()), eLanguage ) ); - sal_uInt16 nEntry = mpCBDateTimeFormat->InsertEntry( aStr ); + const sal_Int32 nEntry = mpCBDateTimeFormat->InsertEntry( aStr ); mpCBDateTimeFormat->SetEntryData( nEntry, reinterpret_cast<void*>((sal_IntPtr)nDateTimeFormats[nFormat] )); if( nDateTimeFormats[nFormat] == eFormat ) { diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 964282975222..c096c0a2f551 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -650,7 +650,7 @@ void IndexTabPage_Impl::InitializeIndex() if ( ( aAnySeq[0] >>= aKeywordList ) && ( aAnySeq[1] >>= aKeywordRefList ) && ( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) ) { - sal_uInt16 nPos; + sal_Int32 nPos; int ndx,tmp; OUString aIndex, aTempString; OUStringBuffer aData( 128 ); // Capacity of up to 128 characters @@ -729,8 +729,8 @@ void IndexTabPage_Impl::InitializeIndex() void IndexTabPage_Impl::ClearIndex() { - sal_uInt16 nCount = m_pIndexCB->GetEntryCount(); - for ( sal_uInt16 i = 0; i < nCount; ++i ) + const sal_Int32 nCount = m_pIndexCB->GetEntryCount(); + for ( sal_Int32 i = 0; i < nCount; ++i ) delete static_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData(i)); m_pIndexCB->Clear(); } @@ -1015,8 +1015,8 @@ void SearchTabPage_Impl::dispose() void SearchTabPage_Impl::ClearSearchResults() { - sal_uInt16 nCount = m_pResultsLB->GetEntryCount(); - for ( sal_uInt16 i = 0; i < nCount; ++i ) + const sal_Int32 nCount = m_pResultsLB->GetEntryCount(); + for ( sal_Int32 i = 0; i < nCount; ++i ) delete static_cast<OUString*>(m_pResultsLB->GetEntryData(i)); m_pResultsLB->Clear(); m_pResultsLB->Update(); @@ -1070,7 +1070,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) OUString aTitle = rRow.getToken( 0, '\t', nIdx ); nIdx = 0; OUString* pURL = new OUString( rRow.getToken( 2, '\t', nIdx ) ); - sal_uInt16 nPos = m_pResultsLB->InsertEntry( aTitle ); + const sal_Int32 nPos = m_pResultsLB->InsertEntry( aTitle ); m_pResultsLB->SetEntryData( nPos, pURL ); } LeaveWait(); @@ -1194,8 +1194,8 @@ void BookmarksBox_Impl::dispose() // save bookmarks to configuration SvtHistoryOptions aHistOpt; aHistOpt.Clear( eHELPBOOKMARKS ); - sal_uInt16 nCount = GetEntryCount(); - for ( sal_uInt16 i = 0; i < nCount; ++i ) + const sal_Int32 nCount = GetEntryCount(); + for ( sal_Int32 i = 0; i < nCount; ++i ) { OUString aTitle = GetEntry(i); OUString* pURL = static_cast<OUString*>(GetEntryData(i)); @@ -1243,7 +1243,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { RemoveEntry( nPos ); - sal_uInt16 nCount = GetEntryCount(); + const sal_Int32 nCount = GetEntryCount(); if ( nCount ) { if ( nPos >= nCount ) @@ -1370,7 +1370,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString { OUString aImageURL = IMAGE_URL; aImageURL += INetURLObject( rURL ).GetHost(); - sal_uInt16 nPos = m_pBookmarksBox->InsertEntry( rTitle, SvFileInformationManager::GetImage( INetURLObject(aImageURL) ) ); + const sal_Int32 nPos = m_pBookmarksBox->InsertEntry( rTitle, SvFileInformationManager::GetImage( INetURLObject(aImageURL) ) ); m_pBookmarksBox->SetEntryData( nPos, new OUString( rURL ) ); } @@ -1516,7 +1516,7 @@ void SfxHelpIndexWindow_Impl::Initialize() nIdx = 0; OUString aURL = rRow.getToken( 2, '\t', nIdx ); OUString* pFactory = new OUString( INetURLObject( aURL ).GetHost() ); - sal_uInt16 nPos = m_pActiveLB->InsertEntry( aTitle ); + const sal_Int32 nPos = m_pActiveLB->InsertEntry( aTitle ); m_pActiveLB->SetEntryData( nPos, pFactory ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 52ab26072267..fb78251687e2 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1178,7 +1178,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) aFilterLb->SetUpdateMode(false); aFilterLb->Clear(); //insert hierarchical at the beginning - sal_uInt16 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString(), 0); + sal_Int32 nPos = aFilterLb->InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString(), 0); aFilterLb->SetEntryData( nPos, reinterpret_cast<void*>(SFXSTYLEBIT_ALL) ); const SfxStyleFilter& rFilter = pItem->GetFilterList(); for( size_t i = 0; i < rFilter.size(); ++i) diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index f43e831566e0..08ea8a4ea2f3 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -2346,7 +2346,7 @@ void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyl const Subset* pSubset; while( NULL != (pSubset = pSubsetMap->GetNextSubset( bFirst )) ) { - sal_uInt16 nPos = pFontsSubsetLB->InsertEntry( pSubset->GetName()); + const sal_Int32 nPos = pFontsSubsetLB->InsertEntry( pSubset->GetName()); pFontsSubsetLB->SetEntryData( nPos, const_cast<Subset *>(pSubset) ); // subset must live at least as long as the selected font !!! if( bFirst ) diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index abd2e5e8480f..f575600e8fd2 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -159,10 +159,9 @@ SmFontPickListBox::SmFontPickListBox (vcl::Window* pParent, WinBits nBits) : IMPL_LINK( SmFontPickListBox, SelectHdl, ListBox *, /*pListBox*/ ) { - sal_uInt16 nPos; OUString aString; - nPos = GetSelectEntryPos(); + const sal_Int32 nPos = GetSelectEntryPos(); if (nPos != 0) { diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 68e5741be0bf..cdea1e8a1fe2 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -327,7 +327,7 @@ IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl ) if (m_xCurrentDetails.get()) m_xCurrentDetails->show(false); - sal_uInt16 nPos = m_pLBServerType->GetSelectEntryPos( ); + const sal_Int32 nPos = m_pLBServerType->GetSelectEntryPos( ); m_xCurrentDetails = m_aDetailsContainers[nPos]; m_nCurrentType = nPos; diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 5b5f0832ce88..9a495f805a9c 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -390,8 +390,8 @@ void CmisDetailsContainer::setPassword( const OUString& rPass ) void CmisDetailsContainer::selectRepository( ) { // Get the repo ID and call the Change listener - sal_uInt16 nPos = m_pLBRepository->GetSelectEntryPos( ); - if( nPos < m_aRepoIds.size() ) + const sal_Int32 nPos = m_pLBRepository->GetSelectEntryPos( ); + if( static_cast<size_t>(nPos) < m_aRepoIds.size() ) { m_sRepoId = m_aRepoIds[nPos]; notifyChange( ); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 019b4d99740d..c694cdbbc7ce 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1305,7 +1305,7 @@ void BrokenRecoveryDialog::impl_refresh() m_bExecutionNeeded = true; - sal_uInt16 nPos = m_pFileListLB->InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); + const sal_Int32 nPos = m_pFileListLB->InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); m_pFileListLB->SetEntryData( nPos, const_cast<TURLInfo *>(&rInfo) ); } m_sSavePath.clear(); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 12c00a4e4138..a79dafb6feb6 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -383,7 +383,7 @@ void SvxRubyDialog::Activate() } if (!sName.isEmpty()) { - sal_uInt16 nPos = m_pCharStyleLB->InsertEntry(sName); + const sal_Int32 nPos = m_pCharStyleLB->InsertEntry(sName); m_pCharStyleLB->SetEntryData( nPos, new OUString(sCoreName) ); } @@ -829,7 +829,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*r long nRubyWidth = rRenderContext.GetTextWidth(sRubyText); rRenderContext.SetFont(aSaveFont); - sal_uInt16 nAdjust = m_pParentDlg->m_pAdjustLB->GetSelectEntryPos(); + sal_Int32 nAdjust = m_pParentDlg->m_pAdjustLB->GetSelectEntryPos(); //use center if no adjustment is available if (nAdjust > 4) nAdjust = 1; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 2577efa68ca0..0dcded535ef4 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2484,8 +2484,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) Color aColSpec( COL_WHITE ); sal_uInt16 nSpecIntens = 20; - sal_uInt16 nPos = m_pLbMatFavorites->GetSelectEntryPos(); - switch( nPos ) + switch( m_pLbMatFavorites->GetSelectEntryPos() ) { case 1: // Metall { @@ -2721,7 +2720,7 @@ bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) aStr += SVX_RESSTR(RID_SVXFLOAT3D_FIX_B); aStr += OUString::number((sal_Int32)rColor.GetBlue()); - sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr ); + const sal_Int32 nPos = pLb->InsertEntry( rColor, aStr ); pLb->SelectEntryPos( nPos ); bRet = true; } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 73cbd3bf269b..26f89905a889 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -4142,9 +4142,9 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() throw( RuntimeE css::uno::Sequence<OUString> aSeq; if (m_pBox) { - sal_uInt16 nEntries = m_pBox ->GetEntryCount(); + const sal_Int32 nEntries = m_pBox ->GetEntryCount(); aSeq = css::uno::Sequence<OUString>( nEntries ); - for ( sal_uInt16 n = nEntries; n; ) + for ( sal_Int32 n = nEntries; n; ) { --n; aSeq.getArray()[n] = m_pBox ->GetEntry( n ); @@ -4177,9 +4177,9 @@ Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( Runt if (m_pBox) { UpdateFromColumn(); - sal_uInt16 nSelEntries = m_pBox->GetSelectEntryCount(); + const sal_Int32 nSelEntries = m_pBox->GetSelectEntryCount(); aSeq = Sequence<sal_Int16>( nSelEntries ); - for ( sal_uInt16 n = 0; n < nSelEntries; n++ ) + for ( sal_Int32 n = 0; n < nSelEntries; ++n ) aSeq.getArray()[n] = m_pBox->GetSelectEntryPos( n ); } return aSeq; @@ -4210,9 +4210,9 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() throw( if (m_pBox) { UpdateFromColumn(); - sal_uInt16 nSelEntries = m_pBox->GetSelectEntryCount(); + const sal_Int32 nSelEntries = m_pBox->GetSelectEntryCount(); aSeq = css::uno::Sequence<OUString>( nSelEntries ); - for ( sal_uInt16 n = 0; n < nSelEntries; n++ ) + for ( sal_Int32 n = 0; n < nSelEntries; ++n ) aSeq.getArray()[n] = m_pBox->GetSelectEntry( n ); } return aSeq; @@ -4472,10 +4472,10 @@ Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeExceptio Sequence< OUString > aItems; if ( m_pComboBox ) { - sal_uInt16 nEntries = m_pComboBox->GetEntryCount(); + const sal_Int32 nEntries = m_pComboBox->GetEntryCount(); aItems.realloc( nEntries ); OUString* pItem = aItems.getArray(); - for ( sal_uInt16 n=0; n<nEntries; ++n, ++pItem ) + for ( sal_Int32 n=0; n<nEntries; ++n, ++pItem ) *pItem = m_pComboBox->GetEntry( n ); } return aItems; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 9eaefc72f438..f96dd5834ea6 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -463,8 +463,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) case( GalleryHintType::THEME_RENAMED ): { - const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos(); - const sal_uInt16 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); + const sal_Int32 nCurSelectPos = mpThemes->GetSelectEntryPos(); + const sal_Int32 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); mpThemes->RemoveEntry( rGalleryHint.GetThemeName() ); ImplInsertThemeEntry( mpGallery->GetThemeInfo( rGalleryHint.GetStringData() ) ); @@ -485,8 +485,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) case( GalleryHintType::CLOSE_THEME ): { - const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos(); - const sal_uInt16 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); + const sal_Int32 nCurSelectPos = mpThemes->GetSelectEntryPos(); + const sal_Int32 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); if( nCurSelectPos == nCloseEntryPos ) { diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 8fa15c13bf0f..dbcfc91b261f 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -339,7 +339,7 @@ void ParaLineSpacingControl::ExecuteLineSpace() mpLineDist->SaveValue(); SvxLineSpacingItem aSpacing(DEFAULT_LINE_SPACING, SID_ATTR_PARA_LINESPACE); - sal_uInt16 nPos = mpLineDist->GetSelectEntryPos(); + const sal_Int32 nPos = mpLineDist->GetSelectEntryPos(); switch ( nPos ) { @@ -367,7 +367,7 @@ void ParaLineSpacingControl::ExecuteLineSpace() SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, &aSpacing, 0L); } -void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, int eSpace, long lValue) +void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_Int32 eSpace, long lValue) { switch ( eSpace ) { @@ -429,7 +429,7 @@ IMPL_LINK_TYPED(ParaLineSpacingControl, PredefinedValuesHandler, Button*, pContr } } -void ParaLineSpacingControl::ExecuteLineSpacing(sal_uInt16 nEntry) +void ParaLineSpacingControl::ExecuteLineSpacing(sal_Int32 nEntry) { SvxLineSpacingItem aSpacing(DEFAULT_LINE_SPACING, SID_ATTR_PARA_LINESPACE); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index da9c3d98493a..efad9e2c8476 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -58,10 +58,10 @@ private: void ExecuteLineSpace(); /// Set one particular value. - static void SetLineSpace(SvxLineSpacingItem& rLineSpace, int eSpace, long lValue = 0); + static void SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_Int32 eSpace, long lValue = 0); /// For the buttons - set the values, and close the popup. - void ExecuteLineSpacing(sal_uInt16 aEntry); + void ExecuteLineSpacing(sal_Int32 aEntry); /// Set mpActlineDistFld and visibility of mpLineDist* fields according to what is just selected. void UpdateMetricFields(); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index f2e029b05895..9b06ad0038b8 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -417,7 +417,7 @@ IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*,) Invalidate(); maVSSpacing->StartSelection(); } - sal_uInt16 nPos = maLBKerning->GetSelectEntryPos(); + const sal_Int32 nPos = maLBKerning->GetSelectEntryPos(); short nKern = 0; SfxMapUnit eUnit = mrTextPropertyPanel.GetSpaceController().GetCoreMetric(); mnLastCus = SPACING_CLOSE_BY_CUS_EDIT; 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); } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 18ab5f2bb552..2d217f475bc8 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1209,7 +1209,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* ) } case TYP_SEQFLD: { - nSubType = m_pChapterLevelLB->GetSelectEntryPos(); + nSubType = static_cast< sal_uInt16 >(m_pChapterLevelLB->GetSelectEntryPos()); if (nSubType == 0) nSubType = 0x7f; else diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index b0a4ae227b21..677ad3f734c9 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -698,7 +698,7 @@ bool SwDBManager::GetTableNames(ListBox* pListBox, const OUString& rDBName) const OUString* pTables = aTables.getConstArray(); for(long i = 0; i < aTables.getLength(); i++) { - sal_uInt16 nEntry = pListBox->InsertEntry(pTables[i]); + const sal_Int32 nEntry = pListBox->InsertEntry(pTables[i]); pListBox->SetEntryData(nEntry, nullptr); } } @@ -710,7 +710,7 @@ bool SwDBManager::GetTableNames(ListBox* pListBox, const OUString& rDBName) const OUString* pQueries = aQueries.getConstArray(); for(long i = 0; i < aQueries.getLength(); i++) { - sal_uInt16 nEntry = pListBox->InsertEntry(pQueries[i]); + const sal_Int32 nEntry = pListBox->InsertEntry(pQueries[i]); pListBox->SetEntryData(nEntry, reinterpret_cast<void*>(1)); } } |