diff options
author | Kurt Zenker <kz@openoffice.org> | 2010-09-03 14:39:55 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2010-09-03 14:39:55 +0200 |
commit | fb46f7604731b35033691987ef4936a5248c9b88 (patch) | |
tree | 9961b43a5f0280bda75e370348875108a5ec6386 /vcl | |
parent | b9c2de6a46e6048684ebec4ac2fdb9fc7ef51190 (diff) | |
parent | 0b78b565774f51ba9770783b5e4b5d0474307ee7 (diff) |
CWS-TOOLING: integrate CWS fs33a
Notes
Notes:
split repo tag: libs-gui_ooo/OOO330_m7
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/vcl/combobox.hxx | 1 | ||||
-rw-r--r-- | vcl/source/control/combobox.cxx | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index e35474a84d53..640c70e7116f 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -138,6 +138,7 @@ public: USHORT GetEntryPos( const XubString& rStr ) const; USHORT GetEntryPos( const void* pData ) const; + Image GetEntryImage( USHORT nPos ) const; XubString GetEntry( USHORT nPos ) const; USHORT GetEntryCount() const; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 8efa3404a44a..5b2e8755e5c8 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -1010,6 +1010,14 @@ void ComboBox::Clear() mpImplLB->Clear(); CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, (void*) sal_IntPtr(-1) ); } +// ----------------------------------------------------------------------- + +Image ComboBox::GetEntryImage( USHORT nPos ) const +{ + if ( mpImplLB->GetEntryList()->HasEntryImage( nPos ) ) + return mpImplLB->GetEntryList()->GetEntryImage( nPos ); + return Image(); +} // ----------------------------------------------------------------------- |