diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:10:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:10:54 +0000 |
| commit | 052f993a4baece44c06211e7d8d0097323f4a02b (patch) | |
| tree | 2617844cf5604dfee913a21c1c8ae4b13bed7089 /sw/source/ui/inc/swlbox.hxx | |
| parent | 029b05da62b364b13f5c0e5bc9ec9ba163ce7e75 (diff) | |
INTEGRATION: CWS swwarnings (1.4.708); FILE MERGED
2007/04/27 06:53:36 os 1.4.708.4: #146889# using, again
2007/04/27 06:38:16 os 1.4.708.3: #146889# prevent use of ComoboBox::InsertEntry
2007/03/26 12:09:09 tl 1.4.708.2: #i69287# warning-free code
2007/03/05 12:45:49 tl 1.4.708.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/ui/inc/swlbox.hxx')
| -rw-r--r-- | sw/source/ui/inc/swlbox.hxx | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index c4ad5a73bf..31d4882fd6 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -4,9 +4,9 @@ * * $RCSfile: swlbox.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 10:03:29 $ + * last change: $Author: hr $ $Date: 2007-09-27 12:10:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,31 +67,34 @@ class SW_DLLPUBLIC SwBoxEntry BOOL bModified : 1; BOOL bNew : 1; + String aName; + USHORT nId; + public: SwBoxEntry(const String& aName, USHORT nId=0); SwBoxEntry(const SwBoxEntry& rOrg); SwBoxEntry(); - String aName; - USHORT nId; + const String& GetName() const { return aName;} }; /*-------------------------------------------------------------------- Beschreibung: fuer ComboBoxen --------------------------------------------------------------------*/ -enum SwComboBoxStyle +typedef USHORT SwComboBoxStyle; +namespace nsSwComboBoxStyle { - CBS_UPPER = 0x01, - CBS_LOWER = 0x02, - CBS_ALL = 0x04, - CBS_FILENAME = 0x08, + const SwComboBoxStyle CBS_UPPER = 0x01; + const SwComboBoxStyle CBS_LOWER = 0x02; + const SwComboBoxStyle CBS_ALL = 0x04; + const SwComboBoxStyle CBS_FILENAME = 0x08; #ifdef WIN - CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER + const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME | CBS_LOWER; #else - CBS_SW_FILENAME = CBS_FILENAME + const SwComboBoxStyle CBS_SW_FILENAME = CBS_FILENAME; #endif -}; +} class SW_DLLPUBLIC SwComboBox : public ComboBox { @@ -105,15 +108,20 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox public: SwComboBox(Window* pParent, const ResId& rId, - USHORT nStyleBits = CBS_ALL); + USHORT nStyleBits = nsSwComboBoxStyle::CBS_ALL); ~SwComboBox(); virtual void KeyInput( const KeyEvent& rKEvt ); - void InsertEntry(const SwBoxEntry&); + using ComboBox::InsertEntry; + void InsertEntry(const SwBoxEntry&); + USHORT InsertEntry( const XubString& rStr, USHORT ) + { InsertEntry( SwBoxEntry( rStr ) ); return 0; } + using ComboBox::RemoveEntry; void RemoveEntry(USHORT nPos); + using ComboBox::GetEntryPos; USHORT GetEntryPos(const SwBoxEntry& rEntry) const; const SwBoxEntry& GetEntry(USHORT) const; @@ -121,6 +129,7 @@ public: const SwBoxEntry& GetRemovedEntry(USHORT nPos) const; USHORT GetStyle() const { return nStyle; } + using Window::SetStyle; void SetStyle(const USHORT nSt) { nStyle = nSt; } String GetText() const; |