diff options
| author | Eike Rathke <erack@redhat.com> | 2014-03-01 03:13:28 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-03-05 07:31:19 -0600 |
| commit | 68ec95b3f80408ae50897b043eed69a07d084df9 (patch) | |
| tree | 5d32076e843fae44f28e3c8d9dbbacf7648fecbc /cui/source/tabpages | |
| parent | c3403ac888c2e62edaf8befe7982f5f8cc95c16f (diff) | |
made ListBox handle more than 64k elements, fdo#61520 related
ListBox and related now handle up to sal_Int32 elements correctly.
sal_Int32 instead of sal_Size or size_t because of UNO and a11y API.
Also disentangled some of the mess of SvTreeList and other containers
regarding sal_uInt16, sal_uLong, long, size_t, ... type mixtures.
Change-Id: Idb6e0ae689dc5bc2cf980721972b57b0261e688a
Reviewed-on: https://gerrit.libreoffice.org/8460
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'cui/source/tabpages')
24 files changed, 253 insertions, 256 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index a1895b115901..e8610a7cdd94 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -60,7 +60,7 @@ static const HorJustConnection::MapEntryType s_pHorJustMap[] = { ALIGNDLG_HORALIGN_BLOCK, SVX_HOR_JUSTIFY_BLOCK }, { ALIGNDLG_HORALIGN_FILL, SVX_HOR_JUSTIFY_REPEAT }, { ALIGNDLG_HORALIGN_DISTRIBUTED, SVX_HOR_JUSTIFY_BLOCK }, - { LISTBOX_ENTRY_NOTFOUND, SVX_HOR_JUSTIFY_STANDARD } + { WRAPPER_LISTBOX_ENTRY_NOTFOUND, SVX_HOR_JUSTIFY_STANDARD } }; // vertical alignment --------------------------------------------------------- @@ -76,7 +76,7 @@ static const VerJustConnection::MapEntryType s_pVerJustMap[] = { ALIGNDLG_VERALIGN_BOTTOM, SVX_VER_JUSTIFY_BOTTOM }, { ALIGNDLG_VERALIGN_BLOCK, SVX_VER_JUSTIFY_BLOCK }, { ALIGNDLG_VERALIGN_DISTRIBUTED, SVX_VER_JUSTIFY_BLOCK }, - { LISTBOX_ENTRY_NOTFOUND, SVX_VER_JUSTIFY_STANDARD } + { WRAPPER_LISTBOX_ENTRY_NOTFOUND, SVX_VER_JUSTIFY_STANDARD } }; // cell rotate mode ----------------------------------------------------------- @@ -89,7 +89,7 @@ static const RotateModeConnection::MapEntryType s_pRotateModeMap[] = { IID_BOTTOMLOCK, SVX_ROTATE_MODE_BOTTOM }, { IID_TOPLOCK, SVX_ROTATE_MODE_TOP }, { IID_CELLLOCK, SVX_ROTATE_MODE_STANDARD }, - { VALUESET_ITEM_NOTFOUND, SVX_ROTATE_MODE_STANDARD } + { WRAPPER_VALUESET_ITEM_NOTFOUND, SVX_ROTATE_MODE_STANDARD } }; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 38610445292e..3334a2185998 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -116,7 +116,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) nLangList |= LANG_LIST_CTL; m_pLanguageLB->SetLanguageList( nLangList, sal_True, sal_True ); m_pLanguageLB->SelectLanguage( LANGUAGE_NONE ); - sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, "listbox entry missing" ); m_pLanguageLB->SetEntryData( nPos, (void*)(long) LANGUAGE_UNDETERMINED ); @@ -144,9 +144,9 @@ void OfaAutoCorrDlg::EnableLanguage(bool bEnable) static sal_Bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, CollatorWrapper& rCmpClass ) { - sal_uInt16 nCount = rLB.GetEntryCount(); - sal_uInt16 nSelPos = rLB.GetSelectEntryPos(); - sal_uInt16 i; + sal_Int32 nCount = rLB.GetEntryCount(); + sal_Int32 nSelPos = rLB.GetSelectEntryPos(); + sal_Int32 i; for(i = 0; i < nCount; i++) { if( 0 == rCmpClass.compareString(rEntry, rLB.GetEntry(i) )) @@ -162,7 +162,7 @@ static sal_Bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) { - sal_uInt16 nPos = pBox->GetSelectEntryPos(); + sal_Int32 nPos = pBox->GetSelectEntryPos(); void* pVoid = pBox->GetEntryData(nPos); LanguageType eNewLang = (LanguageType)(sal_IntPtr)pVoid; // save old settings and fill anew @@ -202,7 +202,7 @@ sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); long nFlags = pAutoCorrect->GetFlags(); - sal_uInt16 nPos = 0; + sal_uLong nPos = 0; pAutoCorrect->SetAutoCorrFlag(Autocorrect, m_pCheckLB->IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(CptlSttWrd, m_pCheckLB->IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, m_pCheckLB->IsChecked(nPos++)); @@ -244,7 +244,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) m_pCheckLB->InsertEntry(m_sNoDblSpaces); m_pCheckLB->InsertEntry(m_sAccidentalCaps); - sal_uInt16 nPos = 0; + sal_uLong nPos = 0; m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & Autocorrect) ); m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & CptlSttWrd) ); m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & CptlSttSntnc) ); @@ -1213,17 +1213,17 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) NewEntry(m_pShortED->GetText(), m_pReplaceED->GetText(), bKeepSourceFormatting); m_pReplaceTLB->SetUpdateMode(sal_False); - sal_uInt32 nPos = UINT_MAX; + sal_uLong nPos = TREELIST_ENTRY_NOTFOUND; sEntry += "\t"; sEntry += m_pReplaceED->GetText(); if(_pNewEntry) { - nPos = (sal_uInt32) m_pReplaceTLB->GetModel()->GetAbsPos(_pNewEntry); + nPos = m_pReplaceTLB->GetModel()->GetAbsPos(_pNewEntry); m_pReplaceTLB->GetModel()->Remove(_pNewEntry); } else { - sal_uInt32 j; + sal_uLong j; for( j = 0; j < m_pReplaceTLB->GetEntryCount(); j++ ) { SvTreeListEntry* pReplaceEntry = m_pReplaceTLB->GetEntry(j); @@ -1234,7 +1234,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) } SvTreeListEntry* pInsEntry = m_pReplaceTLB->InsertEntry( sEntry, static_cast< SvTreeListEntry * >(NULL), false, - nPos == UINT_MAX ? LIST_APPEND : nPos); + nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : nPos); if (bKeepSourceFormatting) { pInsEntry->SetUserData(&bHasSelectionText); // new formatted text @@ -1435,8 +1435,8 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) if(pWrdList) { - sal_uInt16 nCount = pWrdList->size(); - sal_uInt16 i; + size_t nCount = pWrdList->size(); + size_t i; for( i = nCount; i; ) { OUString aString = (*pWrdList)[ --i ]; @@ -1458,8 +1458,8 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) if(pCplList) { - sal_uInt16 nCount = pCplList->size(); - sal_uInt16 i; + size_t nCount = pCplList->size(); + size_t i; for( i = nCount; i; ) { OUString aString = (*pCplList)[ --i ]; @@ -1484,8 +1484,8 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) if(pWrdList) { - sal_uInt16 nCount = pWrdList->size(); - sal_uInt16 i; + size_t nCount = pWrdList->size(); + size_t i; for( i = nCount; i; ) { OUString aString = (*pWrdList)[ --i ]; @@ -1506,20 +1506,19 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) if(pCplList) { - sal_uInt16 nCount = pCplList->size(); - sal_uInt16 i; - for( i = nCount; i; ) + size_t nCount = pCplList->size(); + for( size_t i = nCount; i; ) { OUString aString = (*pCplList)[ --i ]; - if( USHRT_MAX == m_pAbbrevLB->GetEntryPos(aString) ) + if( LISTBOX_ENTRY_NOTFOUND == m_pAbbrevLB->GetEntryPos(aString) ) { pCplList->erase(i); } } - nCount = m_pAbbrevLB->GetEntryCount(); - for( i = 0; i < nCount; ++i ) + sal_Int32 nAbbrevCount = m_pAbbrevLB->GetEntryCount(); + for( sal_Int32 ia = 0; ia < nAbbrevCount; ++ia ) { - pCplList->insert( m_pAbbrevLB->GetEntry( i ) ); + pCplList->insert( m_pAbbrevLB->GetEntry( ia ) ); } pAutoCorrect->SaveCplSttExceptList(eLang); } @@ -1568,7 +1567,7 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset, pArrays = &aStringsTable[eOldLanguage]; // create new array } - sal_uInt16 i; + sal_Int32 i; for(i = 0; i < m_pAbbrevLB->GetEntryCount(); i++) pArrays->aAbbrevStrings.push_back(OUString(m_pAbbrevLB->GetEntry(i))); @@ -1595,7 +1594,7 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset, SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); const SvStringsISortDtor* pCplList = pAutoCorrect->GetCplSttExceptList(eLang); const SvStringsISortDtor* pWrdList = pAutoCorrect->GetWrdSttExceptList(eLang); - sal_uInt16 i; + size_t i; for( i = 0; i < pCplList->size(); i++ ) { m_pAbbrevLB->InsertEntry((*pCplList)[i]); @@ -1832,7 +1831,7 @@ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) if (m_pCheckLB->IsVisible()) { - sal_uInt16 nPos = 0; + sal_uLong nPos = 0; pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace, m_pCheckLB->IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, m_pCheckLB->IsChecked(nPos++)); } @@ -1930,7 +1929,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) m_pCheckLB->InsertEntry( sNonBrkSpace ); m_pCheckLB->InsertEntry( sOrdinal ); - sal_uInt16 nPos = 0; + sal_uLong nPos = 0; m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) ); m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) ); @@ -2128,7 +2127,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(Window* pParent, for( const sal_uInt16* pKeys = aKeyCodes; *pKeys; ++pKeys ) { KeyCode aKCode( *pKeys ); - sal_uInt16 nPos = m_pDCBExpandKey->InsertEntry( aKCode.GetName() ); + sal_Int32 nPos = m_pDCBExpandKey->InsertEntry( aKCode.GetName() ); m_pDCBExpandKey->SetEntryData( nPos, (void*)(sal_uLong)*pKeys ); if( KEY_RETURN == *pKeys ) // default to RETURN m_pDCBExpandKey->SelectEntryPos( nPos ); @@ -2219,7 +2218,7 @@ void OfaAutoCompleteTabPage::Reset( const SfxItemSet& ) // select the specific KeyCode: { sal_uLong nKey = pOpt->nAutoCmpltExpandKey; - for( sal_uInt16 n = 0, nCnt = m_pDCBExpandKey->GetEntryCount(); n < nCnt; ++n ) + for( sal_Int32 n = 0, nCnt = m_pDCBExpandKey->GetEntryCount(); n < nCnt; ++n ) if( nKey == (sal_uLong)m_pDCBExpandKey->GetEntryData( n )) { m_pDCBExpandKey->SelectEntryPos( n ); @@ -2237,7 +2236,7 @@ void OfaAutoCompleteTabPage::Reset( const SfxItemSet& ) { const OUString* pStr = &(*m_pAutoCompleteList)[n]->GetAutoCompleteString(); - sal_uInt16 nPos = m_pLBEntries->InsertEntry( *pStr ); + sal_Int32 nPos = m_pLBEntries->InsertEntry( *pStr ); m_pLBEntries->SetEntryData( nPos, (void*)pStr ); } } @@ -2258,11 +2257,11 @@ void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& ) IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl) { - sal_uInt16 nSelCnt = + sal_Int32 nSelCnt = (m_pAutoCompleteList) ? m_pLBEntries->GetSelectEntryCount() : 0; while( nSelCnt ) { - sal_uInt16 nPos = m_pLBEntries->GetSelectEntryPos( --nSelCnt ); + sal_Int32 nPos = m_pLBEntries->GetSelectEntryPos( --nSelCnt ); OUString* pStr = static_cast<OUString*>(m_pLBEntries->GetEntryData(nPos)); m_pLBEntries->RemoveEntry( nPos ); editeng::IAutoCompleteString hack(*pStr); // UGLY @@ -2288,7 +2287,7 @@ IMPL_LINK( OfaAutoCompleteTabPage, CheckHdl, CheckBox*, pBox ) void OfaAutoCompleteTabPage::CopyToClipboard() const { - sal_uInt16 nSelCnt = m_pLBEntries->GetSelectEntryCount(); + sal_Int32 nSelCnt = m_pLBEntries->GetSelectEntryCount(); if (m_pAutoCompleteList && nSelCnt) { TransferDataContainer* pCntnr = new TransferDataContainer; @@ -2305,7 +2304,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const rtl_TextEncoding nEncode = osl_getThreadTextEncoding(); - for( sal_uInt16 n = 0; n < nSelCnt; ++n ) + for( sal_Int32 n = 0; n < nSelCnt; ++n ) { sData.append(OUStringToOString(m_pLBEntries->GetSelectEntry(n), nEncode)); @@ -2407,7 +2406,7 @@ struct ImplSmartTagLBUserData void OfaSmartTagOptionsTabPage::ClearListBox() { const sal_uLong nCount = m_aSmartTagTypesLB.GetEntryCount(); - for ( sal_uInt16 i = 0; i < nCount; ++i ) + for ( sal_uLong i = 0; i < nCount; ++i ) { const SvTreeListEntry* pEntry = m_aSmartTagTypesLB.GetEntry(i); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); @@ -2463,7 +2462,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) */ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl) { - const sal_uInt16 nPos = m_aSmartTagTypesLB.GetSelectEntryPos(); + const sal_uLong nPos = m_aSmartTagTypesLB.GetSelectEntryPos(); const SvTreeListEntry* pEntry = m_aSmartTagTypesLB.GetEntry(nPos); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec; @@ -2502,7 +2501,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) if ( m_aSmartTagTypesLB.GetEntryCount() < 1 ) return 0; - const sal_uInt16 nPos = m_aSmartTagTypesLB.GetSelectEntryPos(); + const sal_uLong nPos = m_aSmartTagTypesLB.GetSelectEntryPos(); const SvTreeListEntry* pEntry = m_aSmartTagTypesLB.GetEntry(nPos); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec; @@ -2534,7 +2533,7 @@ sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) const sal_uLong nCount = m_aSmartTagTypesLB.GetEntryCount(); - for ( sal_uInt16 i = 0; i < nCount; ++i ) + for ( sal_uLong i = 0; i < nCount; ++i ) { const SvTreeListEntry* pEntry = m_aSmartTagTypesLB.GetEntry(i); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 5b0717ccdd2f..c2c707748968 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -76,7 +76,7 @@ struct SvxBackgroundTable_Impl sal_uInt16 nCellWhich; sal_uInt16 nRowWhich; sal_uInt16 nTableWhich; - sal_uInt16 nActPos; + sal_Int32 nActPos; SvxBackgroundTable_Impl() : pCellBrush(NULL) @@ -94,7 +94,7 @@ struct SvxBackgroundPara_Impl SvxBrushItem* pParaBrush; SvxBrushItem* pCharBrush; - sal_uInt16 nActPos; + sal_Int32 nActPos; SvxBackgroundPara_Impl() : pParaBrush(NULL) @@ -534,7 +534,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) { nDestValue = ((const SfxUInt16Item*)pItem)->GetValue(); // character activated? - sal_uInt16 nParaSel = m_pParaLBox->GetSelectEntryPos(); + sal_Int32 nParaSel = m_pParaLBox->GetSelectEntryPos(); if(1 == nParaSel) { // then it was a "standard"-call @@ -584,7 +584,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) { if(m_pTblLBox->IsVisible()) { - sal_uInt16 nValue = m_pTblLBox->GetSelectEntryPos(); + sal_Int32 nValue = m_pTblLBox->GetSelectEntryPos(); if ( pTableBck_Impl ) { @@ -624,7 +624,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) } else { - sal_uInt16 nValue = m_pParaLBox->GetSelectEntryPos(); + sal_Int32 nValue = m_pParaLBox->GetSelectEntryPos(); if ( pParaBck_Impl ) { @@ -1490,7 +1490,7 @@ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) IMPL_LINK_NOARG(SvxBackgroundTabPage, ModifyGradientHdl_Impl) { - sal_uInt16 nPos = m_pLbGradients->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1635,7 +1635,7 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly) IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) { - sal_uInt16 nSelPos = pBox->GetSelectEntryPos(); + sal_Int32 nSelPos = pBox->GetSelectEntryPos(); if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos) { boost::scoped_ptr<SvxBrushItem> xItemHolder; @@ -1727,7 +1727,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) { - sal_uInt16 nSelPos = pBox->GetSelectEntryPos(); + sal_Int32 nSelPos = pBox->GetSelectEntryPos(); if( pParaBck_Impl && pParaBck_Impl->nActPos != nSelPos) { SvxBrushItem* pActItem = NULL; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index fd7b9057aeac..869bf09d1d39 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -518,7 +518,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) if( !bColorEq ) aColor.SetColor( COL_BLACK ); - sal_uInt16 nSelPos = m_pLbLineColor->GetEntryPos( aColor ); + sal_Int32 nSelPos = m_pLbLineColor->GetEntryPos( aColor ); if( nSelPos == LISTBOX_ENTRY_NOTFOUND ) nSelPos = m_pLbLineColor->InsertEntry( aColor, SVX_RESSTR( RID_SVXSTR_COLOR_USER ) ); diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index eafa40843a86..b6255128812e 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -201,7 +201,7 @@ static const ShadowPosWrapper::MapEntryType s_pShadowPosMap[] = { 3, SVX_SHADOW_TOPRIGHT }, { 4, SVX_SHADOW_BOTTOMLEFT }, { 5, SVX_SHADOW_TOPLEFT }, - { VALUESET_ITEM_NOTFOUND, SVX_SHADOW_NONE } + { WRAPPER_VALUESET_ITEM_NOTFOUND, SVX_SHADOW_NONE } }; class ShadowControlsWrapper : public sfx::MultiControlWrapper< SvxShadowItem > diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index e9a0bd2e6d3b..530741d34214 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -237,14 +237,14 @@ struct SvxCharNamePage_Impl Timer m_aUpdateTimer; OUString m_aNoStyleText; const FontList* m_pFontList; - sal_uInt16 m_nExtraEntryPos; + sal_Int32 m_nExtraEntryPos; sal_Bool m_bMustDelete; sal_Bool m_bInSearchMode; SvxCharNamePage_Impl() : m_pFontList ( NULL ), - m_nExtraEntryPos( LISTBOX_ENTRY_NOTFOUND ), + m_nExtraEntryPos( COMBOBOX_ENTRY_NOTFOUND ), m_bMustDelete ( sal_False ), m_bInSearchMode ( sal_False ) @@ -888,7 +888,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const OUString& rFontName = pNameBox->GetText(); const FontList* pFontList = GetFontList(); OUString aStyleBoxText =pStyleBox->GetText(); - sal_uInt16 nEntryPos = pStyleBox->GetEntryPos( aStyleBoxText ); + sal_Int32 nEntryPos = pStyleBox->GetEntryPos( aStyleBoxText ); if ( nEntryPos >= m_pImpl->m_nExtraEntryPos ) aStyleBoxText = ""; FontInfo aInfo( pFontList->Get( rFontName, aStyleBoxText ) ); @@ -1086,7 +1086,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan } nWhich = GetWhich( nSlot ); pOld = GetOldItem( rSet, nSlot ); - sal_uInt16 nLangPos = pLangBox->GetSelectEntryPos(); + sal_Int32 nLangPos = pLangBox->GetSelectEntryPos(); LanguageType eLangType = (LanguageType)(sal_uLong)pLangBox->GetEntryData( nLangPos ); if ( pOld ) @@ -1432,7 +1432,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() SvxFont& rCJKFont = GetPreviewCJKFont(); SvxFont& rCTLFont = GetPreviewCTLFont(); - sal_uInt16 nPos = m_pUnderlineLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos(); FontUnderline eUnderline = (FontUnderline)(sal_uLong)m_pUnderlineLB->GetEntryData( nPos ); nPos = m_pOverlineLB->GetSelectEntryPos(); FontUnderline eOverline = (FontUnderline)(sal_uLong)m_pOverlineLB->GetEntryData( nPos ); @@ -1458,7 +1458,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() rCJKFont.SetEmphasisMark( eMark ); rCTLFont.SetEmphasisMark( eMark ); - sal_uInt16 nRelief = m_pReliefLB->GetSelectEntryPos(); + sal_Int32 nRelief = m_pReliefLB->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nRelief) { rFont.SetRelief( (FontRelief)nRelief ); @@ -1474,7 +1474,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() rCJKFont.SetShadow( rFont.IsShadow() ); rCTLFont.SetShadow( rFont.IsShadow() ); - sal_uInt16 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); + sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { rFont.SetCaseMap( (SvxCaseMap)nCapsPos ); @@ -1497,7 +1497,7 @@ void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap ) { if ( SVX_CASEMAP_END > eCaseMap ) m_pEffectsLB->SelectEntryPos( - sal::static_int_cast< sal_uInt16 >( eCaseMap ) ); + sal::static_int_cast< sal_Int32 >( eCaseMap ) ); else { m_pEffectsLB->SetNoSelection(); @@ -1545,7 +1545,7 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) rCTLFont.SetColor( aColor.GetColor() == COL_AUTO ? Color(COL_BLACK) : aColor ); m_pPreviewWin->Invalidate(); - sal_uInt16 nSelPos = m_pFontColorLB->GetEntryPos( aColor ); + sal_Int32 nSelPos = m_pFontColorLB->GetEntryPos( aColor ); if ( nSelPos == LISTBOX_ENTRY_NOTFOUND && aColor == Color( COL_TRANSPARENT ) ) nSelPos = m_pFontColorLB->GetEntryPos( m_aTransparentColorName ); @@ -1612,7 +1612,7 @@ IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox ) { if ( m_pEmphasisLB == pBox ) { - sal_uInt16 nEPos = m_pEmphasisLB->GetSelectEntryPos(); + sal_Int32 nEPos = m_pEmphasisLB->GetSelectEntryPos(); sal_Bool bEnable = ( nEPos > 0 && nEPos != LISTBOX_ENTRY_NOTFOUND ); m_pPositionFT->Enable( bEnable ); m_pPositionLB->Enable( bEnable ); @@ -1625,7 +1625,7 @@ IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox ) } else if ( m_pPositionLB != pBox ) { - sal_uInt16 nUPos = m_pUnderlineLB->GetSelectEntryPos(), + sal_Int32 nUPos = m_pUnderlineLB->GetSelectEntryPos(), nOPos = m_pOverlineLB->GetSelectEntryPos(), nSPos = m_pStrikeoutLB->GetSelectEntryPos(); sal_Bool bUEnable = ( nUPos > 0 && nUPos != LISTBOX_ENTRY_NOTFOUND ); @@ -1745,7 +1745,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( eUnderline != UNDERLINE_NONE ) { - for ( sal_uInt16 i = 0; i < m_pUnderlineLB->GetEntryCount(); ++i ) + for ( sal_Int32 i = 0; i < m_pUnderlineLB->GetEntryCount(); ++i ) { if ( (FontUnderline)(sal_uLong)m_pUnderlineLB->GetEntryData(i) == eUnderline ) { @@ -1756,7 +1756,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) } Color aColor = rItem.GetColor(); - sal_uInt16 nPos = m_pUnderlineColorLB->GetEntryPos( aColor ); + sal_Int32 nPos = m_pUnderlineColorLB->GetEntryPos( aColor ); if ( LISTBOX_ENTRY_NOTFOUND != nPos ) m_pUnderlineColorLB->SelectEntryPos( nPos ); @@ -1802,7 +1802,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( eOverline != UNDERLINE_NONE ) { - for ( sal_uInt16 i = 0; i < m_pOverlineLB->GetEntryCount(); ++i ) + for ( sal_Int32 i = 0; i < m_pOverlineLB->GetEntryCount(); ++i ) { if ( (FontUnderline)(sal_uLong)m_pOverlineLB->GetEntryData(i) == eOverline ) { @@ -1813,7 +1813,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) } Color aColor = rItem.GetColor(); - sal_uInt16 nPos = m_pOverlineColorLB->GetEntryPos( aColor ); + sal_Int32 nPos = m_pOverlineColorLB->GetEntryPos( aColor ); if ( LISTBOX_ENTRY_NOTFOUND != nPos ) m_pOverlineColorLB->SelectEntryPos( nPos ); @@ -1859,7 +1859,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( eStrikeout != STRIKEOUT_NONE ) { - for ( sal_uInt16 i = 0; i < m_pStrikeoutLB->GetEntryCount(); ++i ) + for ( sal_Int32 i = 0; i < m_pStrikeoutLB->GetEntryCount(); ++i ) { if ( (FontStrikeout)(sal_uLong)m_pStrikeoutLB->GetEntryData(i) == eStrikeout ) { @@ -1915,13 +1915,13 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) rCJKFont.SetEmphasisMark( eMark ); rCTLFont.SetEmphasisMark( eMark ); - m_pEmphasisLB->SelectEntryPos( (sal_uInt16)( eMark & EMPHASISMARK_STYLE ) ); + m_pEmphasisLB->SelectEntryPos( (sal_Int32)( eMark & EMPHASISMARK_STYLE ) ); eMark &= ~EMPHASISMARK_STYLE; sal_uLong nEntryData = ( eMark == EMPHASISMARK_POS_ABOVE ) ? CHRDLG_POSITION_OVER : ( eMark == EMPHASISMARK_POS_BELOW ) ? CHRDLG_POSITION_UNDER : 0; - for ( sal_uInt16 i = 0; i < m_pPositionLB->GetEntryCount(); i++ ) + for ( sal_Int32 i = 0; i < m_pPositionLB->GetEntryCount(); i++ ) { if ( nEntryData == (sal_uLong)m_pPositionLB->GetEntryData(i) ) { @@ -2171,7 +2171,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) // Underline sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_UNDERLINE ); - sal_uInt16 nPos = m_pUnderlineLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos(); FontUnderline eUnder = (FontUnderline)(sal_uLong)m_pUnderlineLB->GetEntryData( nPos ); if ( pOld ) @@ -2295,8 +2295,8 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_EMPHASISMARK ); - sal_uInt16 nMarkPos = m_pEmphasisLB->GetSelectEntryPos(); - sal_uInt16 nPosPos = m_pPositionLB->GetSelectEntryPos(); + sal_Int32 nMarkPos = m_pEmphasisLB->GetSelectEntryPos(); + sal_Int32 nPosPos = m_pPositionLB->GetSelectEntryPos(); FontEmphasisMark eMark = (FontEmphasisMark)nMarkPos; if ( m_pPositionLB->IsEnabled() ) { @@ -2333,7 +2333,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) pOld = GetOldItem( rSet, SID_ATTR_CHAR_CASEMAP ); SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED; bool bChecked = false; - sal_uInt16 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); + sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { eCaseMap = (SvxCaseMap)nCapsPos; @@ -3172,7 +3172,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) // Kerning nWhich = GetWhich( SID_ATTR_CHAR_KERNING ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_KERNING ); - sal_uInt16 nPos = m_pKerningLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pKerningLB->GetSelectEntryPos(); short nKerning = 0; SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); @@ -3345,14 +3345,14 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) { - sal_uInt16 nEntryPos = 0; + sal_Int32 nEntryPos = 0; ListBox* pBox = bStart ? m_pStartBracketLB : m_pEndBracketLB; if ( 0 == cBracket ) pBox->SelectEntryPos(0); else { bool bFound = false; - for ( sal_uInt16 i = 1; i < pBox->GetEntryCount(); ++i ) + for ( sal_Int32 i = 1; i < pBox->GetEntryCount(); ++i ) { if ( (sal_uLong)pBox->GetEntryData(i) != CHRDLG_ENCLOSE_SPECIAL_CHAR ) { @@ -3394,7 +3394,7 @@ IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl) IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox*, pBox ) { - sal_uInt16 nPos = pBox->GetSelectEntryPos(); + sal_Int32 nPos = pBox->GetSelectEntryPos(); if ( CHRDLG_ENCLOSE_SPECIAL_CHAR == (sal_uLong)pBox->GetEntryData( nPos ) ) SelectCharacter( pBox ); else diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index fc33e7984d3a..e16950107a1e 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -363,7 +363,7 @@ sal_Bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) } - sal_uInt16 nPos = m_pLbType->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbType->GetSelectEntryPos(); if( nPos != m_pLbType->GetSavedValue() ) { if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -448,7 +448,7 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p ) if( p == m_pLbType ) { - sal_uInt16 nPos = m_pLbType->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbType->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { aAttrSet.Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) ); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index bd92d55972f5..bc617adfc63a 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -307,7 +307,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) long nFieldUnit = (long) ( ( const SdrMeasureUnitItem& )rAttrs. Get( SDRATTR_MEASUREUNIT ) ).GetValue(); - for( sal_uInt16 i = 0; i < m_pLbUnit->GetEntryCount(); ++i ) + for( sal_Int32 i = 0; i < m_pLbUnit->GetEntryCount(); ++i ) { if ( (sal_IntPtr)m_pLbUnit->GetEntryData( i ) == nFieldUnit ) { @@ -489,7 +489,7 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) bModified = sal_True; } - sal_uInt16 nPos = m_pLbUnit->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbUnit->GetSelectEntryPos(); if( nPos != m_pLbUnit->GetSavedValue() ) { if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -721,7 +721,7 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) if( p == m_pLbUnit ) { - sal_uInt16 nPos = m_pLbUnit->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbUnit->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbUnit->GetEntryData( nPos ); @@ -796,10 +796,10 @@ void SvxMeasurePage::FillUnitLB() sal_IntPtr nUnit = FUNIT_NONE; OUString aStrMetric( m_pFtAutomatic->GetText()); - sal_uInt16 nPos = m_pLbUnit->InsertEntry( aStrMetric ); + sal_Int32 nPos = m_pLbUnit->InsertEntry( aStrMetric ); m_pLbUnit->SetEntryData( nPos, (void*)nUnit ); - for( sal_uInt16 i = 0; i < aMetricArr.Count(); ++i ) + for( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i ) { aStrMetric = aMetricArr.GetStringByPos( i ); nUnit = aMetricArr.GetValue( i ); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index f66104725ec9..871c47cdfcf0 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -383,8 +383,8 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem = NULL; const SfxBoolItem* pAutoEntryAttr = NULL; - sal_uInt16 nCatLbSelPos = 0; - sal_uInt16 nFmtLbSelPos = 0; + sal_uInt16 nCatLbSelPos = 0; + sal_uInt16 nFmtLbSelPos = 0; LanguageType eLangType = LANGUAGE_DONTKNOW; std::vector<OUString> aFmtEntryList; SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; @@ -530,7 +530,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) pNumFmtShell->GetInitSettings( nCatLbSelPos, eLangType, nFmtLbSelPos, aFmtEntryList, aPrevString, pDummy ); - m_pLbCurrency->SelectEntryPos((sal_uInt16)pNumFmtShell->GetCurrencySymbol()); + m_pLbCurrency->SelectEntryPos((sal_Int32)pNumFmtShell->GetCurrencySymbol()); nFixedCategory=nCatLbSelPos; if(bOneAreaFlag) @@ -848,7 +848,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt for ( ; i < rEntries.size(); ++i ) { aEntry = rEntries[i]; - aPrivCat=pNumFmtShell->GetCategory4Entry( static_cast<sal_uInt16>(i) ); + aPrivCat=pNumFmtShell->GetCategory4Entry( static_cast<short>(i) ); if(aPrivCat!=CAT_TEXT) { Color* pPreviewColor = NULL; @@ -881,13 +881,13 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sal_False*/ ) { OUString theFormat = m_pEdFormat->GetText(); - sal_uInt16 nCurCategory = m_pLbCategory->GetSelectEntryPos(); - sal_uInt16 nCategory = nCurCategory; + sal_Int32 nCurCategory = m_pLbCategory->GetSelectEntryPos(); + sal_uInt16 nCategory = static_cast<sal_uInt16>(nCurCategory); sal_uInt16 nDecimals = 0; sal_uInt16 nZeroes = 0; bool bNegRed = false; bool bThousand = false; - sal_uInt16 nCurrencyPos =m_pLbCurrency->GetSelectEntryPos(); + sal_Int32 nCurrencyPos =m_pLbCurrency->GetSelectEntryPos(); if(bOneAreaFlag) nCurCategory=nFixedCategory; @@ -901,7 +901,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa if(nCategory==CAT_CURRENCY) { sal_uInt16 nTstPos=pNumFmtShell->FindCurrencyFormat(theFormat); - if(nCurrencyPos!=nTstPos && nTstPos!=(sal_uInt16)-1) + if(nCurrencyPos!=static_cast<sal_Int32>(nTstPos) && nTstPos!=(sal_uInt16)-1) { m_pLbCurrency->SelectEntryPos(nTstPos); pNumFmtShell->SetCurrencySymbol(nTstPos); @@ -1143,15 +1143,15 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) // Current category may be UserDefined with no format entries defined. // And yes, m_pLbFormat is a SvxFontListBox with sal_uLong list positions, - // implementation returns a LIST_APPEND if empty, comparison with - // sal_uInt16 LISTBOX_ENTRY_NOTFOUND wouldn't match. - if ( m_pLbFormat->GetSelectEntryPos() == LIST_APPEND ) + // implementation returns a TREELIST_ENTRY_NOTFOUND if empty, + // comparison with sal_Int32 LISTBOX_ENTRY_NOTFOUND wouldn't match. + if ( m_pLbFormat->GetSelectEntryPos() == TREELIST_ENTRY_NOTFOUND ) pLb = m_pLbCategory; // continue with the current category selected else pLb = m_pLbFormat; // continue with the current format selected } - short nTmpCatPos; + sal_Int32 nTmpCatPos; if(bOneAreaFlag) { @@ -1162,29 +1162,27 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) nTmpCatPos=m_pLbCategory->GetSelectEntryPos(); } - sal_uInt16 nCurrencyPos=LISTBOX_ENTRY_NOTFOUND ; - if (nTmpCatPos==CAT_CURRENCY && pLb == m_pLbCurrency ) { - nCurrencyPos = m_pLbCurrency->GetSelectEntryPos(); - pNumFmtShell->SetCurrencySymbol(nCurrencyPos); + sal_Int32 nCurrencyPos = m_pLbCurrency->GetSelectEntryPos(); + pNumFmtShell->SetCurrencySymbol(static_cast<sal_uInt32>(nCurrencyPos)); } // Format-ListBox ---------------------------------------------------- if (pLb == m_pLbFormat) { - sal_uInt16 nSelPos = (sal_uInt16) m_pLbFormat->GetSelectEntryPos(); + sal_uLong nSelPos = m_pLbFormat->GetSelectEntryPos(); OUString aFormat = m_pLbFormat->GetSelectEntry(); OUString aComment; - short nFmtLbSelPos = nSelPos; + short nFmtLbSelPos = static_cast<short>(nSelPos); - aFormat=pNumFmtShell->GetFormat4Entry(nSelPos); - aComment=pNumFmtShell->GetComment4Entry(nSelPos); + aFormat=pNumFmtShell->GetFormat4Entry(nFmtLbSelPos); + aComment=pNumFmtShell->GetComment4Entry(nFmtLbSelPos); if(pNumFmtShell->GetUserDefined4Entry(nFmtLbSelPos)) { - if(pNumFmtShell->GetComment4Entry(nFmtLbSelPos).isEmpty()) + if(aComment.isEmpty()) { aComment = m_pLbCategory->GetEntry(1); } @@ -1194,7 +1192,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) { if(!m_pEdFormat->HasFocus()) m_pEdFormat->SetText( aFormat ); m_pFtComment->SetText(aComment); - ChangePreviewText( nSelPos ); + ChangePreviewText( static_cast<sal_uInt16>(nSelPos) ); } REMOVE_DONTKNOW() // possibly UI-Enable diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 99c18f13002f..c8d612d161e8 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -177,7 +177,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, : SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", rSet) , pActNum(0) , pSaveNum(0) - , nActNumLvl(USHRT_MAX) + , nActNumLvl(SAL_MAX_UINT16) , bModified(false) , bPreset(false) , nNumItemId(SID_ATTR_NUMBERING_RULE) @@ -365,7 +365,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, : SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", rSet) , pActNum(0) , pSaveNum(0) - , nActNumLvl(USHRT_MAX) + , nActNumLvl(SAL_MAX_UINT16) , bModified(false) , bPreset(false) , nNumItemId(SID_ATTR_NUMBERING_RULE) @@ -528,7 +528,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, : SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", rSet) , pActNum(0) , pSaveNum(0) - , nActNumLvl(USHRT_MAX) + , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) , bPreset(false) @@ -776,7 +776,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, : SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", rSet) , pActNum(0) , pSaveNum(0) - , nActNumLvl(USHRT_MAX) + , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) , bPreset(false) @@ -792,7 +792,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, // determine graphic name GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); - sal_uInt16 i = 0; + size_t i = 0; for(std::vector<OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) { m_pExamplesVS->InsertItem( i + 1, i); @@ -971,12 +971,12 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR // Extended numbering schemes present in the resource but not offered by // the i18n framework per configuration must be removed from the listbox. // Do not remove a special entry matching nDoNotRemove. - const sal_uInt16 nDontRemove = 0xffff; + const sal_uInt16 nDontRemove = SAL_MAX_UINT16; ::std::vector< sal_uInt16> aRemove( rFmtLB.GetEntryCount(), nDontRemove); for (size_t i=0; i<aRemove.size(); ++i) { sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)rFmtLB.GetEntryData( - sal::static_int_cast< sal_uInt16 >(i)); + sal::static_int_cast< sal_Int32 >(i)); if (nEntryData > NumberingType::CHARS_LOWER_LETTER_N && nEntryData != nDoNotRemove) aRemove[i] = nEntryData; } @@ -990,7 +990,7 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N) { sal_Bool bInsert = sal_True; - for(sal_uInt16 nEntry = 0; nEntry < rFmtLB.GetEntryCount(); nEntry++) + for(sal_Int32 nEntry = 0; nEntry < rFmtLB.GetEntryCount(); nEntry++) { sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)rFmtLB.GetEntryData(nEntry); if(nEntryData == (sal_uInt16) nCurrent) @@ -1003,7 +1003,7 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR if(bInsert) { OUString aIdent = xInfo->getNumberingIdentifier( nCurrent ); - sal_uInt16 nPos = rFmtLB.InsertEntry(aIdent); + sal_Int32 nPos = rFmtLB.InsertEntry(aIdent); rFmtLB.SetEntryData(nPos,(void*)(sal_uLong)nCurrent); } } @@ -1013,7 +1013,7 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR { if (aRemove[i] != nDontRemove) { - sal_uInt16 nPos = rFmtLB.GetEntryPos( (void*)(sal_uLong)aRemove[i]); + sal_Int32 nPos = rFmtLB.GetEntryPos( (void*)(sal_uLong)aRemove[i]); rFmtLB.RemoveEntry( nPos); } } @@ -1032,7 +1032,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, , bHTMLMode(sal_False) , bMenuButtonInitialized(sal_False) , nBullet(0xff) - , nActNumLvl(USHRT_MAX) + , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) { get(m_pLevelLB, "levellb"); @@ -1150,7 +1150,7 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); - sal_uInt16 nTmpNumLvl = USHRT_MAX; + sal_uInt16 nTmpNumLvl = SAL_MAX_UINT16; if(pExampleSet) { if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem)) @@ -1172,8 +1172,8 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) sal_uInt16 nMask = 1; m_pLevelLB->SetUpdateMode(false); m_pLevelLB->SetNoSelection(); - m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == USHRT_MAX); - if(nActNumLvl != USHRT_MAX) + m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == SAL_MAX_UINT16); + if(nActNumLvl != SAL_MAX_UINT16) for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) @@ -1248,7 +1248,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) sal_uInt16 nMask = 1; m_pLevelLB->SetUpdateMode(false); m_pLevelLB->SetNoSelection(); - if(nActNumLvl == USHRT_MAX) + if(nActNumLvl == SAL_MAX_UINT16) { m_pLevelLB->SelectEntryPos( pSaveNum->GetLevelCount(), true); } @@ -1319,8 +1319,8 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) //remove types that are unsupported by Draw/Impress if(!bContinuous) { - sal_uInt16 nFmtCount = m_pFmtLB->GetEntryCount(); - for(sal_uInt16 i = nFmtCount; i; i--) + sal_Int32 nFmtCount = m_pFmtLB->GetEntryCount(); + for(sal_Int32 i = nFmtCount; i; i--) { sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)m_pFmtLB->GetEntryData(i - 1); if(/*SVX_NUM_NUMBER_NONE == nEntryData ||*/ @@ -1332,14 +1332,14 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if(!pActNum->IsFeatureSupported(NUM_ENABLE_LINKED_BMP)) { sal_IntPtr nData = SVX_NUM_BITMAP|LINK_TOKEN; - sal_uInt16 nPos = m_pFmtLB->GetEntryPos((void*)nData); + sal_Int32 nPos = m_pFmtLB->GetEntryPos((void*)nData); if(LISTBOX_ENTRY_NOTFOUND != nPos) m_pFmtLB->RemoveEntry(nPos); } else if(!pActNum->IsFeatureSupported(NUM_ENABLE_EMBEDDED_BMP)) { sal_IntPtr nData = SVX_NUM_BITMAP; - sal_uInt16 nPos = m_pFmtLB->GetEntryPos((void*)nData); + sal_Int32 nPos = m_pFmtLB->GetEntryPos((void*)nData); if(LISTBOX_ENTRY_NOTFOUND != nPos) m_pFmtLB->RemoveEntry(nPos); } @@ -1359,8 +1359,8 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) // delete all kinds of numeric enumerations if(pActNum->IsFeatureSupported(NUM_NO_NUMBERS)) { - sal_uInt16 nFmtCount = m_pFmtLB->GetEntryCount(); - for(sal_uInt16 i = nFmtCount; i; i--) + sal_Int32 nFmtCount = m_pFmtLB->GetEntryCount(); + for(sal_Int32 i = nFmtCount; i; i--) { sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)m_pFmtLB->GetEntryData(i - 1); if( /*nEntryData >= SVX_NUM_CHARS_UPPER_LETTER &&*/ nEntryData <= SVX_NUM_NUMBER_NONE) @@ -1394,7 +1394,7 @@ void SvxNumOptionsTabPage::InitControls() sal_Int16 eFirstOrient = text::VertOrientation::NONE; Size aFirstSize(0,0); sal_uInt16 nMask = 1; - sal_uInt16 nLvl = USHRT_MAX; + sal_uInt16 nLvl = SAL_MAX_UINT16; sal_uInt16 nHighestLevel = 0; OUString aEmptyStr; @@ -1407,7 +1407,7 @@ void SvxNumOptionsTabPage::InitControls() aNumFmtArr[i] = &pActNum->GetLevel(i); bShowBullet &= aNumFmtArr[i]->GetNumberingType() == SVX_NUM_CHAR_SPECIAL; bShowBitmap &= (aNumFmtArr[i]->GetNumberingType()&(~LINK_TOKEN)) == SVX_NUM_BITMAP; - if(USHRT_MAX == nLvl) + if(SAL_MAX_UINT16 == nLvl) { nLvl = i; sFirstCharFmt = aNumFmtArr[i]->GetCharFmtName(); @@ -1441,7 +1441,7 @@ void SvxNumOptionsTabPage::InitControls() SwitchNumberType(bShowBullet ? 1 : bShowBitmap ? 2 : 0); sal_uInt16 nNumberingType; - if (nLvl != USHRT_MAX) + if (nLvl != SAL_MAX_UINT16) nNumberingType = aNumFmtArr[nLvl]->GetNumberingType(); else { @@ -1463,7 +1463,7 @@ void SvxNumOptionsTabPage::InitControls() m_pOrientLB->SetNoSelection(); else m_pOrientLB->SelectEntryPos( - sal::static_int_cast< sal_uInt16 >(eFirstOrient - 1)); + sal::static_int_cast< sal_Int32 >(eFirstOrient - 1)); // no text::VertOrientation::NONE if(bSameSize) @@ -1498,7 +1498,7 @@ void SvxNumOptionsTabPage::InitControls() } if(bSameAdjust) { - sal_uInt16 nPos = 1; // centered + sal_Int32 nPos = 1; // centered if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT) nPos = 0; else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT) @@ -1787,7 +1787,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox ) { - sal_uInt16 nPos = pBox->GetSelectEntryPos(); + sal_Int32 nPos = pBox->GetSelectEntryPos(); nPos ++; // no VERT_NONE sal_uInt16 nMask = 1; @@ -1965,7 +1965,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl) Graphic aGraphic; OUString sGrfName; std::vector<OUString>::const_iterator it = aGrfNames.begin(); - for(sal_uInt16 i = 0; it != aGrfNames.end(); ++it, ++i) + for(size_t i = 0; it != aGrfNames.end(); ++it, ++i) { sGrfName = *it; INetURLObject aObj(sGrfName); @@ -2147,7 +2147,7 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox ) IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl) { bAutomaticCharStyles = sal_False; - sal_uInt16 nEntryPos = m_pCharFmtLB->GetSelectEntryPos(); + sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos(); OUString sEntry = m_pCharFmtLB->GetSelectEntry(); sal_uInt16 nMask = 1; OUString aEmptyStr; @@ -2191,7 +2191,7 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) aNumFmt.SetStart( (sal_uInt16)m_pStartED->GetValue() ); else //align { - sal_uInt16 nPos = m_pAlignLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pAlignLB->GetSelectEntryPos(); SvxAdjust eAdjust = SVX_ADJUST_CENTER; if(nPos == 0) eAdjust = SVX_ADJUST_LEFT; @@ -2271,7 +2271,7 @@ SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits) , nPageWidth(0) , pOutlineNames(0) , bPosition(false) - , nActLevel(USHRT_MAX) + , nActLevel(SAL_MAX_UINT16) { SetBorderStyle(WINDOW_BORDER_MONO); } @@ -2589,7 +2589,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", rSet) , pActNum(0) , pSaveNum(0) - , nActNumLvl(USHRT_MAX) + , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) , bModified(false) , bPreset(false) @@ -2628,7 +2628,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, m_pRelativeCB->Check(); m_pAlignLB->SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); m_pAlign2LB->SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); - for ( sal_uInt16 i = 0; i < m_pAlignLB->GetEntryCount(); ++i ) + for ( sal_Int32 i = 0; i < m_pAlignLB->GetEntryCount(); ++i ) { m_pAlign2LB->InsertEntry( m_pAlignLB->GetEntry( i ) ); } @@ -2718,7 +2718,7 @@ void SvxNumPositionTabPage::InitControls() const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive && m_pRelativeCB->IsEnabled() && m_pRelativeCB->IsChecked(); const bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && - USHRT_MAX != nActNumLvl; + SAL_MAX_UINT16 != nActNumLvl; m_pDistBorderMF->Enable( !bLabelAlignmentPosAndSpaceModeActive && ( bSingleSelection || bRelative ) ); @@ -2738,14 +2738,14 @@ void SvxNumPositionTabPage::InitControls() const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM]; sal_uInt16 nMask = 1; - sal_uInt16 nLvl = USHRT_MAX; + sal_uInt16 nLvl = SAL_MAX_UINT16; long nFirstBorderTextRelative = -1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { aNumFmtArr[i] = &pActNum->GetLevel(i); if(nActNumLvl & nMask) { - if(USHRT_MAX == nLvl) + if(SAL_MAX_UINT16 == nLvl) nLvl = i; if( i > nLvl) @@ -2825,7 +2825,7 @@ void SvxNumPositionTabPage::InitControls() if(bSameAdjust) { - sal_uInt16 nPos = 1; // centered + sal_Int32 nPos = 1; // centered if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT) nPos = 0; else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT) @@ -2841,7 +2841,7 @@ void SvxNumPositionTabPage::InitControls() if ( bSameLabelFollowedBy ) { - sal_uInt16 nPos = 0; // LISTTAB + sal_Int32 nPos = 0; // LISTTAB if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::SPACE ) { nPos = 1; @@ -2906,7 +2906,7 @@ void SvxNumPositionTabPage::InitControls() void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; - sal_uInt16 nTmpNumLvl = USHRT_MAX; + sal_uInt16 nTmpNumLvl = SAL_MAX_UINT16; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -2929,8 +2929,8 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) sal_uInt16 nMask = 1; m_pLevelLB->SetUpdateMode(false); m_pLevelLB->SetNoSelection(); - m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == USHRT_MAX); - if(nActNumLvl != USHRT_MAX) + m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == SAL_MAX_UINT16); + if(nActNumLvl != SAL_MAX_UINT16) for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) @@ -3015,7 +3015,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) sal_uInt16 nMask = 1; m_pLevelLB->SetUpdateMode(false); m_pLevelLB->SetNoSelection(); - if(nActNumLvl == USHRT_MAX) + if(nActNumLvl == SAL_MAX_UINT16) { m_pLevelLB->SelectEntryPos( pSaveNum->GetLevelCount(), true); } @@ -3133,7 +3133,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); - const sal_uInt16 nPos = m_pAlignLB->IsVisible() + const sal_Int32 nPos = m_pAlignLB->IsVisible() ? m_pAlignLB->GetSelectEntryPos() : m_pAlign2LB->GetSelectEntryPos(); SvxAdjust eAdjust = SVX_ADJUST_CENTER; @@ -3262,7 +3262,7 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld ) IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) { sal_Bool bOn = pBox->IsChecked(); - sal_Bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl; + sal_Bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl; sal_Bool bSetValue = sal_False; long nValue = 0; if(bOn || bSingleSelection) @@ -3307,7 +3307,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl) // determine value to be set at the chosen list levels SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB; { - const sal_uInt16 nPos = m_pLabelFollowedByLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLabelFollowedByLB->GetSelectEntryPos(); if ( nPos == 1 ) { eLabelFollowedBy = SvxNumberFormat::SPACE; @@ -3320,7 +3320,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl) // set value at the chosen list levels bool bSameListtabPos = true; - sal_uInt16 nFirstLvl = USHRT_MAX; + sal_uInt16 nFirstLvl = SAL_MAX_UINT16; sal_uInt16 nMask = 1; for( sal_uInt16 i = 0; i < pActNum->GetLevelCount(); ++i ) { @@ -3330,7 +3330,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl) aNumFmt.SetLabelFollowedBy( eLabelFollowedBy ); pActNum->SetLevel( i, aNumFmt ); - if ( nFirstLvl == USHRT_MAX ) + if ( nFirstLvl == SAL_MAX_UINT16 ) { nFirstLvl = i; } diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index c6d944498419..c49ff5d012fb 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -521,7 +521,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), SFX_MAPUNIT_100TH_MM ); m_pPaperSizeBox->Clear(); - sal_uInt16 nActPos = LISTBOX_ENTRY_NOTFOUND; + sal_Int32 nActPos = LISTBOX_ENTRY_NOTFOUND; sal_uInt16 nAryId = RID_SVXSTRARY_PAPERSIZE_STD; if ( ePaperStart != PAPER_A3 ) @@ -529,12 +529,12 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) ResStringArray aPaperAry( CUI_RES( nAryId ) ); sal_uInt32 nCnt = aPaperAry.Count(); - sal_uInt16 nUserPos = LISTBOX_ENTRY_NOTFOUND; + sal_Int32 nUserPos = LISTBOX_ENTRY_NOTFOUND; for ( sal_uInt32 i = 0; i < nCnt; ++i ) { OUString aStr = aPaperAry.GetString(i); Paper eSize = (Paper)aPaperAry.GetValue(i); - sal_uInt16 nPos = m_pPaperSizeBox->InsertEntry( aStr ); + sal_Int32 nPos = m_pPaperSizeBox->InsertEntry( aStr ); m_pPaperSizeBox->SetEntryData( nPos, (void*)(sal_uLong)eSize ); if ( eSize == ePaper ) @@ -730,7 +730,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) // paper tray nWhich = GetWhich( SID_ATTR_PAGE_PAPERBIN ); - sal_uInt16 nPos = m_pPaperTrayBox->GetSelectEntryPos(); + sal_Int32 nPos = m_pPaperTrayBox->GetSelectEntryPos(); sal_uInt16 nBin = (sal_uInt16)(sal_uLong)m_pPaperTrayBox->GetEntryData( nPos ); pOld = GetOldItem( rSet, SID_ATTR_PAGE_PAPERBIN ); @@ -742,7 +742,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) nPos = m_pPaperSizeBox->GetSelectEntryPos(); Paper ePaper = (Paper)(sal_uLong)m_pPaperSizeBox->GetEntryData( nPos ); - const sal_uInt16 nOld = m_pPaperSizeBox->GetSavedValue(); + const sal_Int32 nOld = m_pPaperSizeBox->GetSavedValue(); bool bChecked = m_pLandscapeBtn->IsChecked(); if ( PAPER_USER == ePaper ) @@ -920,7 +920,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl) OUString aOldName = m_pPaperTrayBox->GetSelectEntry(); m_pPaperTrayBox->SetUpdateMode( false ); m_pPaperTrayBox->Clear(); - sal_uInt16 nEntryPos = m_pPaperTrayBox->InsertEntry( + sal_Int32 nEntryPos = m_pPaperTrayBox->InsertEntry( EE_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ) ); m_pPaperTrayBox->SetEntryData( nEntryPos, (void*)(sal_uLong)PAPERBIN_PRINTER_SETTINGS ); @@ -950,7 +950,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl) IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox ) { - const sal_uInt16 nPos = pBox->GetSelectEntryPos(); + const sal_Int32 nPos = pBox->GetSelectEntryPos(); Paper ePaper = (Paper)(sal_uLong)m_pPaperSizeBox->GetEntryData( nPos ); if ( ePaper != PAPER_USER ) @@ -1027,9 +1027,9 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl) Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ), GetCoreValue( *m_pPaperHeightEdit, eUnit ) ); Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, (MapUnit)eUnit, true ); - sal_uInt16 nEntryCount = m_pPaperSizeBox->GetEntryCount(); + sal_Int32 nEntryCount = m_pPaperSizeBox->GetEntryCount(); - for ( sal_uInt16 i = 0; i < nEntryCount; ++i ) + for ( sal_Int32 i = 0; i < nEntryCount; ++i ) { Paper eTmp = (Paper)(sal_uLong)m_pPaperSizeBox->GetEntryData(i); @@ -1386,7 +1386,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) // Inquiry whether the page margins are beyond the printing area. // If not, ask user whether they shall be taken. // If not, stay on the TabPage. - sal_uInt16 nPos = m_pPaperSizeBox->GetSelectEntryPos(); + sal_Int32 nPos = m_pPaperSizeBox->GetSelectEntryPos(); Paper ePaper = (Paper)(sal_uLong)m_pPaperSizeBox->GetEntryData( nPos ); if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && ePaper != PAPER_SCREEN_16_10 && IsMarginOutOfRange() ) @@ -1567,7 +1567,7 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) OSL_ENSURE(!aList.empty(), "Empty string list"); sStandardRegister = aList[0]; - for( sal_uInt16 i = 1; i < aList.size(); i++ ) + for( size_t i = 1; i < aList.size(); i++ ) m_pRegisterLB->InsertEntry(aList[i]); m_pRegisterCB->Show(); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index af9ef3a0aba9..8df3564ad97e 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -207,7 +207,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) sal_Bool bModified = sal_False; sal_uInt16 nWhich; - sal_uInt16 nPos = m_pLineDist->GetSelectEntryPos(); + sal_Int32 nPos = m_pLineDist->GetSelectEntryPos(); if ( LISTBOX_ENTRY_NOTFOUND != nPos && ( nPos != m_pLineDist->GetSavedValue() || @@ -853,7 +853,7 @@ void SvxStdParagraphTabPage::UpdateExample_Impl( sal_Bool bAll ) m_pExampleWin->SetUpper( (sal_uInt16)m_pTopDist->Denormalize( m_pTopDist->GetValue( FUNIT_TWIP ) ) ); m_pExampleWin->SetLower( (sal_uInt16)m_pBottomDist->Denormalize( m_pBottomDist->GetValue( FUNIT_TWIP ) ) ); - sal_uInt16 nPos = m_pLineDist->GetSelectEntryPos(); + sal_Int32 nPos = m_pLineDist->GetSelectEntryPos(); switch ( nPos ) { @@ -1093,7 +1093,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) SvxAdjust eOneWord = m_pExpandCB->IsChecked() ? SVX_ADJUST_BLOCK : SVX_ADJUST_LEFT; - sal_uInt16 nLBPos = m_pLastLineLB->GetSelectEntryPos(); + sal_Int32 nLBPos = m_pLastLineLB->GetSelectEntryPos(); SvxAdjust eLastBlock = SVX_ADJUST_LEFT; if ( 1 == nLBPos ) @@ -1148,7 +1148,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); SfxItemState eItemState = rSet.GetItemState( _nWhich ); - sal_uInt16 nLBSelect = 0; + sal_Int32 nLBSelect = 0; if ( eItemState >= SFX_ITEM_AVAILABLE ) { const SvxAdjustItem& rAdj = (const SvxAdjustItem&)rSet.Get( _nWhich ); @@ -1286,7 +1286,7 @@ void SvxParaAlignTabPage::UpdateExample_Impl( sal_Bool bAll ) { m_pExampleWin->SetAdjust( SVX_ADJUST_BLOCK ); SvxAdjust eLastBlock = SVX_ADJUST_LEFT; - sal_uInt16 nLBPos = m_pLastLineLB->GetSelectEntryPos(); + sal_Int32 nLBPos = m_pLastLineLB->GetSelectEntryPos(); if(nLBPos == 1) eLastBlock = SVX_ADJUST_CENTER; else if(nLBPos == 2) @@ -1659,8 +1659,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) if ( eBreak == SVX_BREAK_NONE ) m_pPageBreakBox->SetState( TRISTATE_FALSE ); - sal_uInt16 nType = 0; // selection position in break type ListBox : Page - sal_uInt16 nPosition = 0; // selection position in break position ListBox : Before + sal_Int32 nType = 0; // selection position in break type ListBox : Page + sal_Int32 nPosition = 0; // selection position in break position ListBox : Before switch ( eBreak ) { case SVX_BREAK_PAGE_BEFORE: @@ -2090,7 +2090,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox *, pListBox ) IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox *, pListBox ) { //column break or break break after - sal_uInt16 nBreakPos = m_pBreakPositionLB->GetSelectEntryPos(); + sal_Int32 nBreakPos = m_pBreakPositionLB->GetSelectEntryPos(); if ( pListBox->GetSelectEntryPos() == 1 || 1 == nBreakPos) { m_pApplyCollBtn->SetState( TRISTATE_FALSE ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index d68046387806..84aa0b2ec904 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1384,7 +1384,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl) short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB) { short nRel = 0; - sal_uInt16 nPos = rRelationLB.GetSelectEntryPos(); + sal_Int32 nPos = rRelationLB.GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1433,7 +1433,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB) { sal_uInt16 nMapPos = 0; - sal_uInt16 nLBSelPos = rAlignLB.GetSelectEntryPos(); + sal_Int32 nLBSelPos = rAlignLB.GetSelectEntryPos(); if (nLBSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1470,7 +1470,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, long nX, long nY) { - sal_uInt16 nPos = m_pVertLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pVertLB->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pVMap ) { m_nOldV = m_pVMap[nPos].nAlign; @@ -1614,7 +1614,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, void SvxSwPosSizeTabPage::UpdateExample() { - sal_uInt16 nPos = m_pHoriLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pHoriLB->GetSelectEntryPos(); if ( m_pHMap && nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_uInt16 nMapPos = GetMapPos(m_pHMap, *m_pHoriLB); @@ -1675,7 +1675,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft); OUString sEntry = m_aFramePosString.GetString(sStrId1); - sal_uInt16 nPos = rLB.InsertEntry(sEntry); + sal_Int32 nPos = rLB.InsertEntry(sEntry); rLB.SetEntryData(nPos, &aAsCharRelationMap[nRelPos]); if (pMap[_nMapPos].nAlign == nAlign) sSelEntry = sEntry; @@ -1692,7 +1692,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u if (!rLB.GetSelectEntryCount()) { - for (sal_uInt16 i = 0; i < rLB.GetEntryCount(); i++) + for (sal_Int32 i = 0; i < rLB.GetEntryCount(); i++) { RelationMap *pEntry = (RelationMap *)rLB.GetEntryData(i); if (pEntry->nLBRelation == LB_REL_CHAR) // Default @@ -1734,7 +1734,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u SvxSwFramePosString::StringId sStrId1 = m_pHoriMirrorCB->IsChecked() ? aRelationMap[nRelPos].eMirrorStrId : aRelationMap[nRelPos].eStrId; sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft); OUString sEntry = m_aFramePosString.GetString(sStrId1); - sal_uInt16 nPos = rLB.InsertEntry(sEntry); + sal_Int32 nPos = rLB.InsertEntry(sEntry); rLB.SetEntryData(nPos, &aRelationMap[nRelPos]); if (sSelEntry.isEmpty() && aRelationMap[nRelPos].nRelation == nRel) sSelEntry = sEntry; @@ -1767,7 +1767,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u break; } - for (sal_uInt16 i = 0; i < rLB.GetEntryCount(); i++) + for (sal_Int32 i = 0; i < rLB.GetEntryCount(); i++) { RelationMap *pEntry = (RelationMap *)rLB.GetEntryData(i); if (pEntry->nRelation == nRel) @@ -1869,7 +1869,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) if( m_aAnchorPos != Point(0,0) ) // -> Writer { - for( sal_uInt16 i = 1; i < rMarkList.GetMarkCount(); i++ ) + for( sal_uLong i = 1; i < rMarkList.GetMarkCount(); i++ ) { pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( m_aAnchorPos != pObj->GetAnchorPos() ) diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 6ce623593122..ae4706eae637 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -494,9 +494,9 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) nOffset = OutputDevice::LogicToLogic( nOffset, eUnit, MAP_100TH_MM ); } const long nReal = nVal - nOffset; - sal_uInt16 nSize = m_pTabBox->GetEntryCount(); + sal_Int32 nSize = m_pTabBox->GetEntryCount(); - sal_uInt16 i; + sal_Int32 i; for( i = 0; i < nSize; i++ ) { if ( nReal < aNewTabs[i].GetTabPos() ) @@ -533,7 +533,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl) { - sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue() ); + sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue() ); if ( nPos == COMBOBOX_ENTRY_NOTFOUND ) return 0; @@ -612,7 +612,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) } aAktTab.GetAdjustment() = eAdj; - sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); + sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) { @@ -643,7 +643,7 @@ IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox ) cFill = '-'; aAktTab.GetFill() = cFill; - sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); + sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) { @@ -662,7 +662,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit ) if ( !aChar.isEmpty() ) aAktTab.GetFill() = aChar[0]; - const sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit); + const sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) { aNewTabs.Remove( nPos ); @@ -679,7 +679,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit ) if ( !aChar.isEmpty() && ( aChar[0] >= ' ')) aAktTab.GetDecimal() = aChar[0]; - sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); + sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) { aNewTabs.Remove( nPos ); @@ -692,7 +692,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit ) IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl) { - sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); + sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) { aAktTab = aNewTabs[nPos]; @@ -706,7 +706,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl) IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl) { - sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); + sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) { aAktTab = aNewTabs[nPos]; diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 3bdb1cd4c90f..139c3d179b55 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -151,7 +151,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) if( pItem ) { eAniKind = ( ( const SdrTextAniKindItem* )pItem )->GetValue(); - m_pLbEffect->SelectEntryPos( sal::static_int_cast< sal_uInt16 >(eAniKind) ); + m_pLbEffect->SelectEntryPos( sal::static_int_cast< sal_Int32 >(eAniKind) ); } else m_pLbEffect->SetNoSelection(); @@ -335,7 +335,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; - sal_uInt16 nPos; + sal_Int32 nPos; TriState eState; // animation type @@ -459,7 +459,7 @@ SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow, IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) { - sal_uInt16 nPos = m_pLbEffect->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbEffect->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { eAniKind = (SdrTextAniKind) nPos; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 0789d85ab551..354b7ab118d4 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -413,7 +413,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) // transparence gradient const XGradient& rGradient = ((XFillFloatTransparenceItem*)pGradientItem)->GetGradientValue(); XGradientStyle eXGS(rGradient.GetGradientStyle()); - m_pLbTrgrGradientType->SelectEntryPos(sal::static_int_cast< sal_uInt16 >(eXGS)); + m_pLbTrgrGradientType->SelectEntryPos(sal::static_int_cast< sal_Int32 >(eXGS)); m_pMtrTrgrAngle->SetValue(rGradient.GetAngle() / 10); m_pMtrTrgrBorder->SetValue(rGradient.GetBorder()); m_pMtrTrgrCenterX->SetValue(rGradient.GetXOffset()); @@ -769,7 +769,7 @@ void SvxAreaTabPage::Construct() void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { - sal_uInt16 nCount; + sal_Int32 nCount; SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); SFX_ITEMSET_ARG (&rSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,false); if (pPageTypeItem) @@ -782,7 +782,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) if( pColorList.is() ) { - sal_uInt16 _nPos = 0; + sal_Int32 _nPos = 0; if( *pnBitmapListState ) { @@ -918,7 +918,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( nDlgType == 0 ) // area dialog { - sal_uInt16 nPosOrig = nPos; + sal_Int32 nPosOrig = nPos; XFillStyle eStyle = (XFillStyle) m_pTypeLB->GetSelectEntryPos(); switch( eStyle ) { @@ -968,7 +968,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { - sal_uInt16 _nPos; + sal_Int32 _nPos; sal_Bool bModified = sal_False; if( nDlgType != 0 || *pbAreaTP ) @@ -1413,7 +1413,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) { eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rAttrs. Get( GetWhich( XATTR_FILLSTYLE ) ) ).GetValue() ); - m_pTypeLB->SelectEntryPos( sal::static_int_cast< sal_uInt16 >( eXFS ) ); + m_pTypeLB->SelectEntryPos( sal::static_int_cast< sal_Int32 >( eXFS ) ); if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLCOLOR)) { @@ -1816,7 +1816,7 @@ void SvxAreaTabPage::ClickColorHdl_Impl() IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; - sal_uInt16 _nPos = m_pLbColor->GetSelectEntryPos(); + sal_Int32 _nPos = m_pLbColor->GetSelectEntryPos(); m_pLbHatchBckgrdColor->SelectEntryPos( _nPos ); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -1887,7 +1887,7 @@ void SvxAreaTabPage::ClickGradientHdl_Impl() IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; - sal_uInt16 _nPos = m_pLbGradient->GetSelectEntryPos(); + sal_Int32 _nPos = m_pLbGradient->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { // fill ItemSet and pass it on to aCtlXRectPreview @@ -1958,7 +1958,7 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl() IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; - sal_uInt16 _nPos = m_pLbHatching->GetSelectEntryPos(); + sal_Int32 _nPos = m_pLbHatching->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { // fill ItemSet and pass it on to aCtlXRectPreview @@ -1986,7 +1986,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl) IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; - sal_uInt16 _nPos = m_pLbHatchBckgrdColor->GetSelectEntryPos(); + sal_Int32 _nPos = m_pLbHatchBckgrdColor->GetSelectEntryPos(); m_pLbColor->SelectEntryPos( _nPos ); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -2085,7 +2085,7 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl() IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl) { const SfxPoolItem* pPoolItem = NULL; - sal_uInt16 _nPos = m_pLbBitmap->GetSelectEntryPos(); + sal_Int32 _nPos = m_pLbBitmap->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { // fill ItemSet and pass it on to aCtlXRectPreview diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index daf46ac8847c..9602ab38d91a 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -136,8 +136,8 @@ void SvxBitmapTabPage::Construct() void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) { - sal_uInt16 nPos; - sal_uInt16 nCount; + sal_Int32 nPos; + sal_Int32 nCount; if( nDlgType == 0 ) // area dialog { @@ -232,7 +232,7 @@ sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) if(PT_BITMAP == *pPageType) { _rOutAttrs.Put(XFillStyleItem(XFILL_BITMAP)); - sal_uInt16 nPos = m_pLbBitmaps->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos); @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) long SvxBitmapTabPage::CheckChanges_Impl() { - sal_uInt16 nPos = m_pLbBitmaps->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { if( bBmpChanged ) @@ -661,7 +661,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) { - sal_uInt16 nPos = m_pLbBitmaps->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -726,7 +726,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) { - sal_uInt16 nPos = m_pLbBitmaps->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index d4dfbdc3cd6f..6f242a794b65 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -279,12 +279,12 @@ void SvxColorTabPage::Update(bool bLoaded) struct SvxColorTabPageShadow { sal_uInt16 nUnknownType; - sal_uInt16 nUnknownPos; + sal_Int32 nUnknownPos; sal_Bool bIsAreaTP; sal_uInt16 nChangeType; SvxColorTabPageShadow() : nUnknownType( COLORPAGE_UNKNOWN ) - , nUnknownPos( COLORPAGE_UNKNOWN ) + , nUnknownPos( LISTBOX_ENTRY_NOTFOUND ) , bIsAreaTP( sal_False ) , nChangeType( 0 ) { @@ -493,7 +493,7 @@ long SvxColorTabPage::CheckChanges_Impl() if (eCM != CM_RGB) ConvertColorValues (aTmpColor, CM_RGB); - sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { Color aColor = pColorList->GetColor( nPos )->GetColor(); @@ -564,7 +564,7 @@ sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) OUString aString; Color aColor; - sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { aColor = pColorList->GetColor( nPos )->GetColor(); @@ -608,7 +608,7 @@ void SvxColorTabPage::Reset( const SfxItemSet& rSet ) // set color model OUString aStr = GetUserData(); - m_pLbColorModel->SelectEntryPos( (sal_uInt16) aStr.toInt32() ); + m_pLbColorModel->SelectEntryPos( aStr.toInt32() ); ChangeColorHdl_Impl( this ); SelectColorModelHdl_Impl( this ); @@ -742,7 +742,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) { - sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -862,7 +862,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl) IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) { - sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -899,7 +899,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl) { - sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { m_pValSetColorList->SelectItem( nPos + 1 ); @@ -922,7 +922,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl) IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl) { - sal_uInt16 nPos = m_pValSetColorList->GetSelectItemId(); + sal_Int32 nPos = m_pValSetColorList->GetSelectItemId(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { m_pLbColor->SelectEntryPos( nPos - 1 ); @@ -1059,7 +1059,7 @@ long SvxColorTabPage::ChangeColorHdl_Impl( void* ) // for( long i = 0; i < nCount; i++ ) // { // pColorEntry = pColorList->GetColor( i ); -// rVs.InsertItem( (sal_uInt16) i + 1, pColorEntry->GetColor(), pColorEntry->GetName() ); +// rVs.InsertItem( i + 1, pColorEntry->GetColor(), pColorEntry->GetName() ); // } //} diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 3fd8650c558c..def2fa7bfa0f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -151,8 +151,8 @@ void SvxGradientTabPage::Construct() void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) { - sal_uInt16 nPos; - sal_uInt16 nCount; + sal_Int32 nPos; + sal_Int32 nCount; if( nDlgType == 0 ) // area dialog { @@ -252,7 +252,7 @@ long SvxGradientTabPage::CheckChanges_Impl() (sal_uInt16) m_pMtrColorFrom->GetValue(), (sal_uInt16) m_pMtrColorTo->GetValue() ); - sal_uInt16 nPos = m_pLbGradients->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { XGradient aGradient = pGradientList->GetGradient( nPos )->GetGradient(); @@ -314,7 +314,7 @@ sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) XGradient* pXGradient = NULL; OUString aString; - sal_uInt16 nPos = m_pLbGradients->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { pXGradient = new XGradient( pGradientList->GetGradient( nPos )->GetGradient() ); @@ -509,7 +509,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) { - sal_uInt16 nPos = m_pLbGradients->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -579,7 +579,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) { - sal_uInt16 nPos = m_pLbGradients->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -798,7 +798,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl) XGradientStyle eXGS = pGradient->GetGradientStyle(); m_pLbGradientType->SelectEntryPos( - sal::static_int_cast< sal_uInt16 >( eXGS ) ); + sal::static_int_cast< sal_Int32 >( eXGS ) ); // if the entry is not in the listbox, // colors are added temporarily m_pLbColorFrom->SetNoSelection(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 711a782cc3af..374c4c77864b 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -147,8 +147,8 @@ void SvxHatchTabPage::Construct() void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) { - sal_uInt16 nPos; - sal_uInt16 nCount; + sal_Int32 nPos; + sal_Int32 nCount; if( nDlgType == 0 ) // area dialog { @@ -270,7 +270,7 @@ long SvxHatchTabPage::CheckChanges_Impl() delete aMessDlg; } - sal_uInt16 nPos = m_pLbHatchings->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) *pPos = nPos; return 0L; @@ -288,7 +288,7 @@ sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) XHatch* pXHatch = NULL; OUString aString; - sal_uInt16 nPos = m_pLbHatchings->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { pXHatch = new XHatch( pHatchingList->GetHatch( nPos )->GetHatch() ); @@ -410,7 +410,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl) if( pHatch ) { m_pLbLineType->SelectEntryPos( - sal::static_int_cast< sal_uInt16 >( pHatch->GetHatchStyle() ) ); + sal::static_int_cast< sal_Int32 >( pHatch->GetHatchStyle() ) ); // if the entry is not in the listbox // the color is added temporarily m_pLbLineColor->SetNoSelection(); @@ -553,7 +553,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) { - sal_uInt16 nPos = m_pLbHatchings->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -623,7 +623,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl) { - sal_uInt16 nPos = m_pLbHatchings->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e6f886f0c536..883d7e55dae2 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -494,7 +494,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) void SvxLineTabPage::FillListboxes() { // Line styles - sal_uInt16 nOldSelect = m_pLbLineStyle->GetSelectEntryPos(); + sal_Int32 nOldSelect = m_pLbLineStyle->GetSelectEntryPos(); // aLbLineStyle.FillStyles(); m_pLbLineStyle->Fill( pDashList ); m_pLbLineStyle->SelectEntryPos( nOldSelect ); @@ -522,8 +522,8 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) SetPageType(pPageTypeItem->GetValue()); if( nDlgType == 0 && pDashList.is() ) { - sal_uInt16 nPos; - sal_uInt16 nCount; + sal_Int32 nPos; + sal_Int32 nCount; // Dash list if( ( *pnDashListState & CT_MODIFIED ) || @@ -617,7 +617,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) if( *pnColorListState & CT_CHANGED ) pColorList = ( (SvxLineTabDialog*) GetParentDialog() )->GetNewColorList(); // aLbColor - sal_uInt16 nColorPos = m_pLbColor->GetSelectEntryPos(); + sal_Int32 nColorPos = m_pLbColor->GetSelectEntryPos(); m_pLbColor->Clear(); m_pLbColor->Fill( pColorList ); nCount = m_pLbColor->GetEntryCount(); @@ -652,7 +652,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { nPageType = 1; // possibly for extensions *pPosDashLb = m_pLbLineStyle->GetSelectEntryPos() - 2;// First entry SOLID!!! - sal_uInt16 nPos = m_pLbStartStyle->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbStartStyle->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) nPos--; *pPosLineEndLb = nPos; @@ -669,7 +669,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; - sal_uInt16 nPos; + sal_Int32 nPos; sal_Bool bModified = sal_False; // To prevent modifications to the list, we do not set other page's items. @@ -961,7 +961,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) sal_Bool SvxLineTabPage::FillXLSet_Impl() { - sal_uInt16 nPos; + sal_Int32 nPos; if( m_pLbLineStyle->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) { @@ -1279,7 +1279,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) if(rItemPolygon == rEntryPolygon) { // select this entry - m_pLbStartStyle->SelectEntryPos((sal_uInt16)a + 1); + m_pLbStartStyle->SelectEntryPos(a + 1); bSelected = sal_True; } } @@ -1311,7 +1311,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) if(rItemPolygon == rEntryPolygon) { // select this entry - m_pLbEndStyle->SelectEntryPos((sal_uInt16)a + 1); + m_pLbEndStyle->SelectEntryPos(a + 1); bSelected = sal_True; } } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index f2d9ab92b182..6f63b82680fb 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -248,7 +248,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() - sal_uInt16 nPos = m_pLbLineStyles->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { *pPosDashLb = nPos; @@ -612,7 +612,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) { - sal_uInt16 nPos = m_pLbLineStyles->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -684,7 +684,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) { - sal_uInt16 nPos = m_pLbLineStyles->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -898,7 +898,7 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - sal_uInt16 nOldSelect = m_pLbLineStyles->GetSelectEntryPos(); + sal_Int32 nOldSelect = m_pLbLineStyles->GetSelectEntryPos(); m_pLbLineStyles->Clear(); m_pLbLineStyles->Fill( pDashList ); m_pLbLineStyles->SelectEntryPos( nOldSelect ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 946ef7635f1f..7e38307ed807 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -181,7 +181,7 @@ int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) void SvxLineEndDefTabPage::CheckChanges_Impl() { - sal_uInt16 nPos = m_pLbLineEnds->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -308,7 +308,7 @@ long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* ) IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) { - sal_uInt16 nPos = m_pLbLineEnds->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -506,7 +506,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) { - sal_uInt16 nPos = m_pLbLineEnds->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -660,7 +660,7 @@ void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - sal_uInt16 nOldSelect = m_pLbLineEnds->GetSelectEntryPos(); + sal_Int32 nOldSelect = m_pLbLineEnds->GetSelectEntryPos(); m_pLbLineEnds->Clear(); m_pLbLineEnds->Fill( pLineEndList ); m_pLbLineEnds->SelectEntryPos( nOldSelect ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 1899cef2cc6c..98378f102172 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -182,8 +182,8 @@ void SvxShadowTabPage::Construct() void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) { - sal_uInt16 nPos; - sal_uInt16 nCount; + sal_Int32 nPos; + sal_Int32 nCount; SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); if (pPageTypeItem) @@ -319,7 +319,7 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) } // ShadowColor - sal_uInt16 nPos = m_pLbShadowColor->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbShadowColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbShadowColor->GetSavedValue() ) { @@ -497,7 +497,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) else rXFSet.Put( XFillStyleItem( XFILL_NONE ) ); - sal_uInt16 nPos = m_pLbShadowColor->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbShadowColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { rXFSet.Put( XFillColorItem( OUString(), m_pLbShadowColor->GetSelectEntryColor() ) ); |