diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-08-27 15:35:58 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-08-27 15:35:58 +0200 |
| commit | 29acfaa05987035a61d9d7e7dbe978d490337311 (patch) | |
| tree | 74c5846e13ab463d084f9d196a082a913382fa07 /vcl | |
| parent | e42e01e951a83646fd5e037e241cb729579704d6 (diff) | |
| parent | 044ecdab8e5be57dbb4f40049bfa297bf9aa6c3f (diff) | |
dba33h: merge after pulling in fs33a
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(); +} // ----------------------------------------------------------------------- |