diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-09-14 15:45:02 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-09-14 22:07:17 +0200 |
| commit | 051b29e1025253f35f87a04e297760aa8b40611f (patch) | |
| tree | f836152e4e5db963740760d05d1d5358776493e3 /include | |
| parent | d6a83d3f91336e23b51bfc3b3d58da799760829f (diff) | |
convert Edit autocomplete Hdl to boost signals2
Here it also keep track of the connection, as it needs to be explicitly
disconnected in one place.
Change-Id: Id3e2882106ae55c2d880898956a36f84d3ce70ef
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/inettbc.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/combobox.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/edit.hxx | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 82e324887a68..8d073a88765a 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -48,9 +48,10 @@ friend class SvtURLBox_Impl; SVT_DLLPRIVATE bool ProcessKey( const vcl::KeyCode& rCode ); SVT_DLLPRIVATE void TryAutoComplete(); SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl(); - DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* ); SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID); + SAL_DLLPRIVATE void AutoCompleteHandler( Edit* ); + protected: virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Select() SAL_OVERRIDE; diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 95e35193030a..b80d088ab748 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_VCL_COMBOBOX_HXX #define INCLUDED_VCL_COMBOBOX_HXX +#include <boost/signals2/connection.hpp> #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> #include <vcl/combobox.h> @@ -50,6 +51,7 @@ private: sal_Int32 m_nMaxWidthChars; Link maSelectHdl; Link maDoubleClickHdl; + boost::signals2::scoped_connection mAutocompleteConnection; struct ComboBoxBounds { @@ -71,11 +73,11 @@ private: DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, void* ); DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit* ); DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* ); SAL_DLLPRIVATE void ImplClickButtonHandler( ImplBtn* ); SAL_DLLPRIVATE void ImplUserDrawHandler( UserDrawEvent* ); + SAL_DLLPRIVATE void ImplAutocompleteHandler( Edit* ); protected: using Window::ImplInit; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 391e825437c0..5d41a1bf0852 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_VCL_EDIT_HXX #define INCLUDED_VCL_EDIT_HXX +#include <boost/signals2/signal.hpp> #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/timer.hxx> @@ -94,7 +95,6 @@ private: mbActivePopup:1; Link maModifyHdl; Link maUpdateDataHdl; - Link maAutocompleteHdl; css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; @@ -238,8 +238,7 @@ public: void SetSubEdit( Edit* pEdit ); Edit* GetSubEdit() const { return mpSubEdit; } - void SetAutocompleteHdl( const Link& rHdl ); - const Link& GetAutocompleteHdl() const { return maAutocompleteHdl; } + boost::signals2::signal< void ( Edit* ) > autocompleteSignal; AutocompleteAction GetAutocompleteAction() const { return meAutocompleteAction; } virtual Size CalcMinimumSize() const; |