tdf#135550 FmXListBoxCell does need to implement XListBox after all

regression since...

commit 0677d46bcc56c1f6c27b9331662990b38fd452d6
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Wed May 20 15:22:56 2020 +0100

FmXListBoxCell doesn't need to implement css::awt::XListBox

It seems just addItemListener/removeItemListener are needed, stub
the rest to make sense just for single-selection mode and avoid
the return of the apparently unused multi-selection complexity

Change-Id: I46a32bdd23d44273da37cc21cfa45de907674f31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100746
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 294 insertions, 0 deletions

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 4bc0b5179ee9..58c46c9a6f27 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3895,6 +3895,8 @@ FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, std::unique_ptr<DbCellCont
   , m_aItemListeners(m_aMutex)
   , m_aActionListeners(m_aMutex)
   , m_pBox(&static_cast<svt::ListBoxControl&>(m_pCellControl->GetWindow()))
+  , m_nLines(Application::GetSettings().GetStyleSettings().GetListBoxMaximumLineCount())
+  , m_bMulti(false)
 {
     m_pBox->SetAuxModifyHdl(LINK(this, FmXListBoxCell, ChangedHdl));
 }
@@ -3921,8 +3923,268 @@ void FmXListBoxCell::disposing()
     FmXTextCell::disposing();
 }
 
+Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType )
+{
+    Any aReturn = FmXTextCell::queryAggregation(_rType);
+
+    if ( !aReturn.hasValue() )
+        aReturn = FmXListBoxCell_Base::queryInterface( _rType );
+
+    return aReturn;
+}
+
+Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes(  )
+{
+    return ::comphelper::concatSequences(
+        FmXTextCell::getTypes(),
+        FmXListBoxCell_Base::getTypes()
+    );
+}
+
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXListBoxCell )
 
+void SAL_CALL FmXListBoxCell::addItemListener(const Reference< css::awt::XItemListener >& l)
+{
+    m_aItemListeners.addInterface( l );
+}
+
+void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< css::awt::XItemListener >& l)
+{
+    m_aItemListeners.removeInterface( l );
+}
+
+void SAL_CALL FmXListBoxCell::addActionListener(const Reference< css::awt::XActionListener >& l)
+{
+    m_aActionListeners.addInterface( l );
+}
+
+void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< css::awt::XActionListener >& l)
+{
+    m_aActionListeners.removeInterface( l );
+}
+
+void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (m_pBox)
+    {
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        rBox.insert_text(nPos, aItem);
+    }
+}
+
+void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItems, sal_Int16 nPos)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (m_pBox)
+    {
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        sal_uInt16 nP = nPos;
+        for ( const auto& rItem : aItems )
+        {
+            rBox.insert_text(nP, rItem);
+            if ( nPos != -1 )    // Not if 0xFFFF, because LIST_APPEND
+                nP++;
+        }
+    }
+}
+
+void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if ( m_pBox )
+    {
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        for ( sal_uInt16 n = nCount; n; )
+            rBox.remove( nPos + (--n) );
+    }
+}
+
+sal_Int16 SAL_CALL FmXListBoxCell::getItemCount()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (!m_pBox)
+        return 0;
+    weld::ComboBox& rBox = m_pBox->get_widget();
+    return rBox.get_count();
+}
+
+OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (!m_pBox)
+        return OUString();
+    weld::ComboBox& rBox = m_pBox->get_widget();
+    return rBox.get_text(nPos);
+}
+
+css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    css::uno::Sequence<OUString> aSeq;
+    if (m_pBox)
+    {
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        const sal_Int32 nEntries = rBox.get_count();
+        aSeq = css::uno::Sequence<OUString>( nEntries );
+        for ( sal_Int32 n = nEntries; n; )
+        {
+            --n;
+            aSeq.getArray()[n] = rBox.get_text( n );
+        }
+    }
+    return aSeq;
+}
+
+sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if (m_pBox)
+    {
+        UpdateFromColumn();
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        sal_Int32 nPos = rBox.get_active();
+        if (nPos > SHRT_MAX || nPos < SHRT_MIN)
+            throw std::out_of_range("awt::XListBox::getSelectedItemPos can only return a short");
+        return nPos;
+    }
+    return 0;
+}
+
+Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    Sequence<sal_Int16> aSeq;
+
+    if (m_pBox)
+    {
+        UpdateFromColumn();
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        auto nActive = rBox.get_active();
+        if (nActive != -1)
+        {
+            aSeq = Sequence<sal_Int16>(1);
+            aSeq.getArray()[0] = nActive;
+        }
+    }
+    return aSeq;
+}
+
+OUString SAL_CALL FmXListBoxCell::getSelectedItem()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    OUString aItem;
+
+    if (m_pBox)
+    {
+        UpdateFromColumn();
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        aItem = rBox.get_active_text();
+    }
+
+    return aItem;
+}
+
+css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    css::uno::Sequence<OUString> aSeq;
+
+    if (m_pBox)
+    {
+        UpdateFromColumn();
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        auto nActive = rBox.get_active();
+        if (nActive != -1)
+        {
+            aSeq = css::uno::Sequence<OUString>(1);
+            aSeq.getArray()[0] = rBox.get_text(nActive);
+        }
+    }
+    return aSeq;
+}
+
+void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    if (m_pBox)
+    {
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        if (bSelect)
+            rBox.set_active(nPos);
+        else if (nPos == rBox.get_active())
+            rBox.set_active(-1);
+    }
+}
+
+void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPositions, sal_Bool bSelect)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    if (m_pBox)
+    {
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        for ( sal_uInt16 n = static_cast<sal_uInt16>(aPositions.getLength()); n; )
+        {
+            auto nPos = static_cast<sal_uInt16>(aPositions.getConstArray()[--n]);
+            if (bSelect)
+                rBox.set_active(nPos);
+            else if (nPos == rBox.get_active())
+                rBox.set_active(-1);
+        }
+    }
+}
+
+void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    if (m_pBox)
+    {
+        weld::ComboBox& rBox = m_pBox->get_widget();
+        auto nPos = rBox.find_text(aItem);
+        if (bSelect)
+            rBox.set_active(nPos);
+        else if (nPos == rBox.get_active())
+            rBox.set_active(-1);
+    }
+}
+
+sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return m_bMulti;
+}
+
+void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    m_bMulti = bMulti;
+}
+
+sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    return m_nLines;
+}
+
+void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    m_nLines = nLines; // just store it to return it
+}
+
+void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 /*nEntry*/)
+{
+}
+
 IMPL_LINK_NOARG(FmXListBoxCell, ChangedHdl, LinkParamNone*, void)
 {
     if (!m_pBox)
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index db8883a1e997..48b005c199e3 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -940,16 +940,46 @@ public:
     virtual void SAL_CALL setActionCommand( const OUString& Command ) override;
 };
 
+typedef ::cppu::ImplHelper1 <   css::awt::XListBox
+                            >   FmXListBoxCell_Base;
 class FmXListBoxCell final : public FmXTextCell
+                           , public FmXListBoxCell_Base
 {
 public:
     FmXListBoxCell( DbGridColumn* pColumn, std::unique_ptr<DbCellControl> pControl );
 
+    DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell)
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
+// css::awt::XListBox
+    virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override;
+    virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override;
+    virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener >& l) override;
+    virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener >& l) override;
+    virtual void SAL_CALL addItem(const OUString& aItem, sal_Int16 nPos) override;
+    virtual void SAL_CALL addItems(const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos) override;
+    virtual void SAL_CALL removeItems(sal_Int16 nPos, sal_Int16 nCount) override;
+    virtual sal_Int16 SAL_CALL getItemCount() override;
+    virtual OUString SAL_CALL getItem(sal_Int16 nPos) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getItems() override;
+    virtual sal_Int16 SAL_CALL getSelectedItemPos() override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() override;
+    virtual OUString SAL_CALL getSelectedItem() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems() override;
+    virtual void SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) override;
+    virtual void SAL_CALL selectItemsPos(const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) override;
+    virtual void SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) override;
+    virtual sal_Bool SAL_CALL isMutipleMode() override;
+    virtual void SAL_CALL setMultipleMode(sal_Bool bMulti) override;
+    virtual sal_Int16 SAL_CALL getDropDownLineCount() override;
+    virtual void SAL_CALL setDropDownLineCount(sal_Int16 nLines) override;
+    virtual void SAL_CALL makeVisible(sal_Int16 nEntry) override;
+
 private:
     virtual ~FmXListBoxCell() override;
 
@@ -960,6 +990,8 @@ private:
     ::comphelper::OInterfaceContainerHelper2   m_aItemListeners,
                                         m_aActionListeners;
     VclPtr<::svt::ListBoxControl> m_pBox;
+    sal_uInt16 m_nLines;
+    bool m_bMulti;
 };