commit 9d48e8fdf4e1efed5fc82e2ca00f2252debc94da
author Eike Rathke <erack@redhat.com> Tue May 13 15:05:40 2014 +0200
committer Eike Rathke <erack@redhat.com> Tue May 13 15:08:04 2014 +0200
tree c942fd6ff23c7f4bf4c2d81bd73b218e493f70a1
parent 99595346359145d8cf909e5795919fb239cccbd9

sal_Int32 ComboBox::InsertEntryWithImage()

Change-Id: Iaa1ddc931b71fcdf08d571c7e3573a936d378709

include/vcl/combobox.hxx

diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 51770b2..8af4458 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -130,7 +130,7 @@ public:
    virtual void    SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE;

    virtual sal_Int32  InsertEntry(const OUString& rStr, sal_Int32  nPos = COMBOBOX_APPEND);
    void            InsertEntryWithImage( const OUString& rStr, const Image& rImage, sal_Int32  nPos = COMBOBOX_APPEND );
    sal_Int32       InsertEntryWithImage( const OUString& rStr, const Image& rImage, sal_Int32  nPos = COMBOBOX_APPEND );

    void            RemoveEntry( const OUString& rStr );
    virtual void    RemoveEntryAt(sal_Int32  nPos);

vcl/source/control/combobox.cxx

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 521d13a..cfd2e8e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -872,11 +872,11 @@ sal_Int32 ComboBox::InsertEntry(const OUString& rStr, sal_Int32 const nPos)
    return nRealPos;
}

void ComboBox::InsertEntryWithImage(
sal_Int32 ComboBox::InsertEntryWithImage(
        const OUString& rStr, const Image& rImage, sal_Int32 const nPos)
{
    if (nPos < 0 || COMBOBOX_MAX_ENTRIES <= mpImplLB->GetEntryList()->GetEntryCount())
        return;
        return COMBOBOX_ERROR;

    sal_Int32 nRealPos;
    if (nPos == COMBOBOX_APPEND)
@@ -885,13 +885,14 @@ void ComboBox::InsertEntryWithImage(
    {
        const sal_Int32 nMRUCount = mpImplLB->GetEntryList()->GetMRUCount();
        if (nPos > COMBOBOX_MAX_ENTRIES - nMRUCount)
            return;
            return COMBOBOX_ERROR;
        nRealPos = nPos + nMRUCount;
    }

    nRealPos = mpImplLB->InsertEntry( nRealPos, rStr, rImage );
    nRealPos -= mpImplLB->GetEntryList()->GetMRUCount();
    CallEventListeners( VCLEVENT_COMBOBOX_ITEMADDED, (void*) sal_IntPtr(nRealPos) );
    return nRealPos;
}

void ComboBox::RemoveEntry( const OUString& rStr )