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/source | |
| 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/source')
| -rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 1fca973e12f7..ea1fde843517 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -463,7 +463,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent) { GrabFocus(); - if (rMouseEvent.IsLeft() && Rectangle(Point(0, 0), GetOutputSizePixel()).IsInside(rMouseEvent.GetPosPixel())) + if (rMouseEvent.IsLeft() && Rectangle(Point(0, 0), GetOutputSizePixel()).IsInside(rMouseEvent.GetPosPixel()) && maSelectHdlLink.IsSet()) { for (size_t i = 0; i < maElementList.size() ; i++) { @@ -471,7 +471,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent) Rectangle rect(element->mBoxLocation, element->mBoxSize); if (rect.IsInside(rMouseEvent.GetPosPixel())) { - selectedSignal(element); + maSelectHdlLink.Call(*element); return; } } @@ -720,7 +720,7 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf mpElementsControl->SetBackground( Color( COL_WHITE ) ); mpElementsControl->SetTextColor( Color( COL_BLACK ) ); mpElementsControl->setElementSetId(RID_CATEGORY_UNARY_BINARY_OPERATORS); - mpElementsControl->selectedSignal.connect( boost::bind( &SmElementsDockingWindow::SelectClickHandler, this, _1 ) ); + mpElementsControl->SetSelectHdl(LINK(this, SmElementsDockingWindow, SelectClickHandler)); } SmElementsDockingWindow::~SmElementsDockingWindow () @@ -752,7 +752,7 @@ void SmElementsDockingWindow::EndDocking( const Rectangle& rReactangle, bool bFl mpElementsControl->setVerticalMode(bVertical); } -void SmElementsDockingWindow::SelectClickHandler( SmElement* pElement ) +IMPL_LINK_TYPED(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, void) { SmViewShell* pViewSh = GetView(); @@ -760,7 +760,7 @@ void SmElementsDockingWindow::SelectClickHandler( SmElement* pElement ) { pViewSh->GetViewFrame()->GetDispatcher()->Execute( SID_INSERTCOMMANDTEXT, SfxCallMode::RECORD, - new SfxStringItem(SID_INSERTCOMMANDTEXT, pElement->getText()), 0L); + new SfxStringItem(SID_INSERTCOMMANDTEXT, rElement.getText()), 0L); } } |