diff options
Diffstat (limited to 'sw/source/ui/cctrl/swlbox.cxx')
-rw-r--r-- | sw/source/ui/cctrl/swlbox.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx index a6a50a01f851..ebb91b5f7ff7 100644 --- a/sw/source/ui/cctrl/swlbox.cxx +++ b/sw/source/ui/cctrl/swlbox.cxx @@ -45,16 +45,16 @@ SV_IMPL_PTRARR(SwEntryLst, SwBoxEntry*) SwBoxEntry::SwBoxEntry() : - bModified(FALSE), - bNew(FALSE), + bModified(sal_False), + bNew(sal_False), nId(LISTBOX_APPEND) { } -SwBoxEntry::SwBoxEntry(const String& aNam, USHORT nIdx) : - bModified(FALSE), - bNew(FALSE), +SwBoxEntry::SwBoxEntry(const String& aNam, sal_uInt16 nIdx) : + bModified(sal_False), + bNew(sal_False), aName(aNam), nId(nIdx) { @@ -72,13 +72,13 @@ SwBoxEntry::SwBoxEntry(const SwBoxEntry& rOld) : -SwComboBox::SwComboBox(Window* pParent, const ResId& rId, USHORT nStyleBits ): +SwComboBox::SwComboBox(Window* pParent, const ResId& rId, sal_uInt16 nStyleBits ): ComboBox(pParent, rId), nStyle(nStyleBits) { // Verwaltung fuer die Stringlist aus der Resource aufbauen - USHORT nSize = GetEntryCount(); - for( USHORT i=0; i < nSize; ++i ) + sal_uInt16 nSize = GetEntryCount(); + for( sal_uInt16 i=0; i < nSize; ++i ) { const SwBoxEntry* pTmp = new SwBoxEntry(ComboBox::GetEntry(i), i); aEntryLst.Insert(pTmp, aEntryLst.Count() ); @@ -112,7 +112,7 @@ void SwComboBox::InsertEntry(const SwBoxEntry& rEntry) --------------------------------------------------------------------*/ -void SwComboBox::RemoveEntry(USHORT nPos) +void SwComboBox::RemoveEntry(sal_uInt16 nPos) { if(nPos >= aEntryLst.Count()) return; @@ -136,7 +136,7 @@ void SwComboBox::RemoveEntry(USHORT nPos) Beschreibung: Position by Name --------------------------------------------------------------------*/ -USHORT SwComboBox::GetEntryPos(const SwBoxEntry& rEntry) const +sal_uInt16 SwComboBox::GetEntryPos(const SwBoxEntry& rEntry) const { return ComboBox::GetEntryPos(rEntry.aName); } @@ -146,7 +146,7 @@ USHORT SwComboBox::GetEntryPos(const SwBoxEntry& rEntry) const --------------------------------------------------------------------*/ -const SwBoxEntry& SwComboBox::GetEntry(USHORT nPos) const +const SwBoxEntry& SwComboBox::GetEntry(sal_uInt16 nPos) const { if(nPos < aEntryLst.Count()) return *aEntryLst[nPos]; @@ -159,13 +159,13 @@ const SwBoxEntry& SwComboBox::GetEntry(USHORT nPos) const --------------------------------------------------------------------*/ -USHORT SwComboBox::GetRemovedCount() const +sal_uInt16 SwComboBox::GetRemovedCount() const { return aDelEntryLst.Count(); } -const SwBoxEntry& SwComboBox::GetRemovedEntry(USHORT nPos) const +const SwBoxEntry& SwComboBox::GetRemovedEntry(sal_uInt16 nPos) const { if(nPos < aDelEntryLst.Count()) return *aDelEntryLst[nPos]; @@ -181,7 +181,7 @@ const SwBoxEntry& SwComboBox::GetRemovedEntry(USHORT nPos) const void SwComboBox::InsertSorted(SwBoxEntry* pEntry) { ComboBox::InsertEntry(pEntry->aName); - USHORT nPos = ComboBox::GetEntryPos(pEntry->aName); + sal_uInt16 nPos = ComboBox::GetEntryPos(pEntry->aName); aEntryLst.C40_INSERT(SwBoxEntry, pEntry, nPos); } @@ -193,7 +193,7 @@ void SwComboBox::InsertSorted(SwBoxEntry* pEntry) void SwComboBox::KeyInput( const KeyEvent& rKEvt ) { - USHORT nChar = rKEvt.GetCharCode(); + sal_uInt16 nChar = rKEvt.GetCharCode(); if(nStyle & CBS_FILENAME) { |