mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert Link<> to typed

Browse Source 
Change-Id: Ibd1baf909bc49ad0e7fa1fc9fdd2f42d59162960
This commit is contained in:
Noel Grandin
2015-09-17 12:59:04 +02:00
parent 363cf98b34
commit 6048935ff4
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
reportdesign/source/ui/inc/ColorListener.hxx
View File

@@ -33,10 +33,10 @@ namespace rptui
void operator =(const OColorListener&) SAL_DELETED_FUNCTION; void operator =(const OColorListener&) SAL_DELETED_FUNCTION;
protected: protected:
OModuleClient m_aModuleClient; OModuleClient m_aModuleClient;
Link<> m_aCollapsedLink; Link<OColorListener&,void> m_aCollapsedLink;
svtools::ColorConfig m_aColorConfig; svtools::ColorConfig m_aColorConfig;
svtools::ExtendedColorConfig m_aExtendedColorConfig; svtools::ExtendedColorConfig m_aExtendedColorConfig;
OUString m_sColorEntry; OUString m_sColorEntry;
sal_Int32 m_nColor; sal_Int32 m_nColor;
sal_Int32 m_nTextBoundaries; sal_Int32 m_nTextBoundaries;
bool m_bCollapsed; bool m_bCollapsed;
@@ -63,7 +63,7 @@ namespace rptui
*/ */
inline bool isMarked() const { return m_bMarked; } inline bool isMarked() const { return m_bMarked; }
inline void setCollapsedHdl(const Link<>& _aLink ){ m_aCollapsedLink = _aLink; } inline void setCollapsedHdl(const Link<OColorListener&,void>& _aLink ){ m_aCollapsedLink = _aLink; }
inline bool isCollapsed() const { return m_bCollapsed; } inline bool isCollapsed() const { return m_bCollapsed; }
/** collapse or expand /** collapse or expand

2
reportdesign/source/ui/inc/SectionWindow.hxx
View File

@@ -79,7 +79,7 @@ namespace rptui
bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn); bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn);
void ImplInitSettings(); void ImplInitSettings();
DECL_LINK(Collapsed,OColorListener*); DECL_LINK_TYPED(Collapsed, OColorListener&, void);
DECL_LINK_TYPED(StartSplitHdl, Splitter*, void); DECL_LINK_TYPED(StartSplitHdl, Splitter*, void);
DECL_LINK_TYPED(SplitHdl, Splitter*, void); DECL_LINK_TYPED(SplitHdl, Splitter*, void);
DECL_LINK_TYPED(EndSplitHdl, Splitter*, void); DECL_LINK_TYPED(EndSplitHdl, Splitter*, void);

2
reportdesign/source/ui/misc/ColorListener.cxx
View File

@@ -78,7 +78,7 @@ void OColorListener::setCollapsed(bool _bCollapsed)
{ {
m_bCollapsed = _bCollapsed; m_bCollapsed = _bCollapsed;
if ( m_aCollapsedLink.IsSet() ) if ( m_aCollapsedLink.IsSet() )
m_aCollapsedLink.Call(this); m_aCollapsedLink.Call(*this);
} }
} }

16
reportdesign/source/ui/report/SectionWindow.cxx
View File

@@ -296,18 +296,14 @@ void OSectionWindow::setMarked(bool _bMark)
m_aEndMarker->setMarked(_bMark); m_aEndMarker->setMarked(_bMark);
} }
IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker ) IMPL_LINK_TYPED( OSectionWindow, Collapsed, OColorListener&, _rMarker, void )
{ {
if ( _pMarker ) bool bShow = !_rMarker.isCollapsed();
{ m_aReportSection->Show(bShow);
bool bShow = !_pMarker->isCollapsed(); m_aEndMarker->Show(bShow);
m_aReportSection->Show(bShow); m_aSplitter->Show(bShow);
m_aEndMarker->Show(bShow);
m_aSplitter->Show(bShow);
m_pParent->resize(*this); m_pParent->resize(*this);
}
return 0L;
} }
void OSectionWindow::zoom(const Fraction& _aZoom) void OSectionWindow::zoom(const Fraction& _aZoom)

2
reportdesign/source/ui/report/StartMarker.cxx
View File

@@ -183,7 +183,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
m_aVRuler->Show(!m_bCollapsed && m_bShowRuler); m_aVRuler->Show(!m_bCollapsed && m_bShowRuler);
if ( m_aCollapsedLink.IsSet() ) if ( m_aCollapsedLink.IsSet() )
m_aCollapsedLink.Call(this); m_aCollapsedLink.Call(*this);
} }
m_pParent->showProperties(); m_pParent->showProperties();