diff options
Diffstat (limited to 'sw/source/ui/misc/numberingtypelistbox.cxx')
| -rw-r--r-- | sw/source/ui/misc/numberingtypelistbox.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 964d04738755..39186bb6de60 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -53,7 +53,7 @@ struct SwNumberingTypeListBox_Impl ---------------------------------------------------------------------------*/ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, const ResId& rResId, - USHORT nTypeFlags ) : + sal_uInt16 nTypeFlags ) : ListBox(pWin, rResId), pImpl(new SwNumberingTypeListBox_Impl) { @@ -76,7 +76,7 @@ SwNumberingTypeListBox::~SwNumberingTypeListBox() /* -----------------------------01.03.01 16:02-------------------------------- ---------------------------------------------------------------------------*/ -void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) +void SwNumberingTypeListBox::Reload(sal_uInt16 nTypeFlags) { Clear(); uno::Sequence<sal_Int16> aTypes; @@ -95,7 +95,7 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) { long nValue = rNames.GetValue(i); sal_Bool bInsert = sal_True; - USHORT nPos = LISTBOX_APPEND; + sal_uInt16 nPos = LISTBOX_APPEND; switch(nValue) { case style::NumberingType::NUMBER_NONE: @@ -125,7 +125,7 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) } if(bInsert) { - USHORT nEntry = InsertEntry(rNames.GetString(i), nPos); + sal_uInt16 nEntry = InsertEntry(rNames.GetString(i), nPos); SetEntryData( nEntry, (void*)nValue ); } } @@ -138,11 +138,11 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) sal_Int16 nCurrent = pTypes[nType]; if(nCurrent > style::NumberingType::CHARS_LOWER_LETTER_N) { - if(LISTBOX_ENTRY_NOTFOUND == GetEntryPos((void*)(ULONG)nCurrent)) + if(LISTBOX_ENTRY_NOTFOUND == GetEntryPos((void*)(sal_uLong)nCurrent)) { OUString aIdent = pImpl->xInfo->getNumberingIdentifier( nCurrent ); - USHORT nPos = InsertEntry(aIdent); - SetEntryData(nPos,(void*)(ULONG)nCurrent); + sal_uInt16 nPos = InsertEntry(aIdent); + SetEntryData(nPos,(void*)(sal_uLong)nCurrent); } } } @@ -156,9 +156,9 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType() { sal_Int16 nRet = 0; - USHORT nSelPos = GetSelectEntryPos(); + sal_uInt16 nSelPos = GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nSelPos) - nRet = (sal_Int16)(ULONG)GetEntryData(nSelPos); + nRet = (sal_Int16)(sal_uLong)GetEntryData(nSelPos); #ifdef DBG_UTIL else DBG_ERROR("SwNumberingTypeListBox not selected"); @@ -170,7 +170,7 @@ sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType() ---------------------------------------------------------------------------*/ sal_Bool SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType) { - USHORT nPos = GetEntryPos((void*)(ULONG)nType); + sal_uInt16 nPos = GetEntryPos((void*)(sal_uLong)nType); SelectEntryPos( nPos ); return LISTBOX_ENTRY_NOTFOUND != nPos; } |