diff options
Diffstat (limited to 'sw/source/ui/inc/swlbox.hxx')
| -rw-r--r-- | sw/source/ui/inc/swlbox.hxx | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 678eaf09e8..265b5ad3c5 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -47,14 +47,14 @@ class SW_DLLPUBLIC SwBoxEntry { friend class SwComboBox; - BOOL bModified : 1; - BOOL bNew : 1; + sal_Bool bModified : 1; + sal_Bool bNew : 1; String aName; - USHORT nId; + sal_uInt16 nId; public: - SwBoxEntry(const String& aName, USHORT nId=0); + SwBoxEntry(const String& aName, sal_uInt16 nId=0); SwBoxEntry(const SwBoxEntry& rOrg); SwBoxEntry(); @@ -64,7 +64,7 @@ public: /*-------------------------------------------------------------------- Beschreibung: fuer ComboBoxen --------------------------------------------------------------------*/ -typedef USHORT SwComboBoxStyle; +typedef sal_uInt16 SwComboBoxStyle; namespace nsSwComboBoxStyle { @@ -72,11 +72,7 @@ namespace nsSwComboBoxStyle const SwComboBoxStyle CBS_LOWER = 0x02; const SwComboBoxStyle CBS_ALL = 0x04; const SwComboBoxStyle CBS_FILENAME = 0x08; -#ifdef WIN - const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER; -#else const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME; -#endif } class SW_DLLPUBLIC SwComboBox : public ComboBox @@ -84,7 +80,7 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox SwEntryLst aEntryLst; SwEntryLst aDelEntryLst; SwBoxEntry aDefault; - USHORT nStyle; + sal_uInt16 nStyle; SW_DLLPRIVATE void InitComboBox(); SW_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry); @@ -98,25 +94,25 @@ public: using ComboBox::GetEntryPos; SwComboBox(Window* pParent, const ResId& rId, - USHORT nStyleBits = nsSwComboBoxStyle::CBS_ALL); + sal_uInt16 nStyleBits = nsSwComboBoxStyle::CBS_ALL); ~SwComboBox(); virtual void KeyInput( const KeyEvent& rKEvt ); void InsertEntry(const SwBoxEntry&); - USHORT InsertEntry( const XubString& rStr, USHORT = 0) + sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 = 0) { InsertEntry( SwBoxEntry( rStr ) ); return 0; } - void RemoveEntry(USHORT nPos); + void RemoveEntry(sal_uInt16 nPos); - USHORT GetEntryPos(const SwBoxEntry& rEntry) const; - const SwBoxEntry& GetEntry(USHORT) const; + sal_uInt16 GetEntryPos(const SwBoxEntry& rEntry) const; + const SwBoxEntry& GetEntry(sal_uInt16) const; - USHORT GetRemovedCount() const; - const SwBoxEntry& GetRemovedEntry(USHORT nPos) const; + sal_uInt16 GetRemovedCount() const; + const SwBoxEntry& GetRemovedEntry(sal_uInt16 nPos) const; - USHORT GetStyle() const { return nStyle; } - void SetStyle(const USHORT nSt) { nStyle = nSt; } + sal_uInt16 GetStyle() const { return nStyle; } + void SetStyle(const sal_uInt16 nSt) { nStyle = nSt; } String GetText() const; }; |