diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-18 13:38:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-18 15:48:31 +0000 |
| commit | 548c2274c9ba7542d6bcae5fefd1400ee4e22fc3 (patch) | |
| tree | 7963bec49ed00b89090bd213a7db36a85bc88f87 /starmath/inc | |
| parent | 423b79e7366203db3f57dea75b8cb9eb852b5614 (diff) | |
move from boost::signal to typed Link
it doesn't really gain us much to have a handful of
boost::signal use in a sea of Links
This also fixes a regression in
commit 051b29e1025253f35f87a04e297760aa8b40611f
Author: Luboš Luňák <l.lunak@collabora.com>
Date: Sun Sep 14 15:45:02 2014 +0200
convert Edit autocomplete Hdl to boost signals2
where the conversion was...
- if ( maAutocompleteHdl.IsSet() )
+ if ( autocompleteSignal.empty() )
instead of the correct
+ if ( !autocompleteSignal.empty() )
Change-Id: I27270d94c782485c0a7e929bc4980af4527fe82b
Diffstat (limited to 'starmath/inc')
| -rw-r--r-- | starmath/inc/ElementsDockingWindow.hxx | 6 | ||||
| -rw-r--r-- | starmath/inc/pch/precompiled_sm.hxx | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index a458d9d20359..6518326ed693 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX #define INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX -#include <boost/signals2/signal.hpp> #include <sfx2/dockwin.hxx> #include <svx/dlgctrl.hxx> #include <vcl/scrbar.hxx> @@ -90,6 +89,7 @@ class SmElementsControl : public Control SmFormat maFormat; sal_uInt16 maCurrentSetId; SmElement* mpCurrentElement; + Link<SmElement&,void> maSelectHdlLink; std::vector< std::unique_ptr<SmElement> > maElementList; Size maMaxElementDimensions; @@ -122,7 +122,7 @@ public: DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); void DoScroll(long nDelta); - boost::signals2::signal< void ( SmElement* ) > selectedSignal; + void SetSelectHdl(const Link<SmElement&,void>& rLink) { maSelectHdlLink = rLink; } }; class SmElementsDockingWindow : public SfxDockingWindow @@ -135,7 +135,7 @@ class SmElementsDockingWindow : public SfxDockingWindow virtual void Resize() override; SmViewShell* GetView(); - void SelectClickHandler(SmElement* pElement); + DECL_LINK_TYPED(SelectClickHandler, SmElement&, void); DECL_LINK_TYPED(ElementSelectedHandle, ListBox&, void); public: diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index 2d3175ac0cef..7decc8c2dae5 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.hxx @@ -41,7 +41,6 @@ #include <boost/checked_delete.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/optional/optional.hpp> -#include <boost/signals2/signal.hpp> #include <osl/diagnose.h> #include <osl/module.hxx> #include <osl/mutex.hxx> |