diff options
Diffstat (limited to 'forms/source/component/ListBox.hxx')
-rw-r--r-- | forms/source/component/ListBox.hxx | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index c0ad179d39f5..cad8cc708b4b 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX -#define INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX +#pragma once #include <FormComponent.hxx> #include "cachedrowset.hxx" @@ -31,6 +30,7 @@ #include <com/sun/star/awt/XListBox.hpp> #include <com/sun/star/form/XChangeBroadcaster.hpp> +#include <comphelper/interfacecontainer3.hxx> #include <comphelper/asyncnotification.hxx> #include <connectivity/FValue.hxx> #include <cppuhelper/implbase4.hxx> @@ -122,7 +122,14 @@ private: virtual css::uno::Sequence< css::uno::Type> _getTypes() override; public: - DECLARE_DEFAULT_LEAF_XTOR( OListBoxModel ); + OListBoxModel( + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory + ); + OListBoxModel( + const OListBoxModel* _pOriginal, + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory + ); + virtual ~OListBoxModel() override; // XServiceInfo OUString SAL_CALL getImplementationName() override @@ -215,7 +222,7 @@ private: */ void impl_refreshDbEntryList( bool _bForce ); - void setBoundValues(const ValueList&); + void setBoundValues(ValueList &&); void clearBoundValues(); ValueList impl_getValues() const; @@ -239,8 +246,8 @@ class OListBoxControl :public OBoundControl ,public IEventProcessor { private: - ::comphelper::OInterfaceContainerHelper2 m_aChangeListeners; - ::comphelper::OInterfaceContainerHelper2 m_aItemListeners; + ::comphelper::OInterfaceContainerHelper3<css::form::XChangeListener> m_aChangeListeners; + ::comphelper::OInterfaceContainerHelper3<css::awt::XItemListener> m_aItemListeners; css::uno::Any m_aCurrentSelection; Idle m_aChangeIdle; @@ -322,6 +329,4 @@ private: } -#endif // INCLUDED_FORMS_SOURCE_COMPONENT_LISTBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |