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

WaE: implicit conversion from bool to 'long'

Browse Source 
Change-Id: Ibe8bf3070fb64b447315b280c7c06a7851f7a7ed
This commit is contained in:
Tor Lillqvist
2014-04-28 16:49:12 +03:00
parent 5fab47ddbe
commit 6f59894afc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svtools/tabbar.hxx
View File

@@ -389,7 +389,7 @@ private:
SVT_DLLPRIVATE void ImplEnableControls(); SVT_DLLPRIVATE void ImplEnableControls();
SVT_DLLPRIVATE void ImplSelect(); SVT_DLLPRIVATE void ImplSelect();
SVT_DLLPRIVATE void ImplActivatePage(); SVT_DLLPRIVATE void ImplActivatePage();
SVT_DLLPRIVATE long ImplDeactivatePage(); SVT_DLLPRIVATE bool ImplDeactivatePage();
SVT_DLLPRIVATE void ImplPrePaint(); SVT_DLLPRIVATE void ImplPrePaint();
SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount );
SVT_DLLPRIVATE Rectangle ImplGetInsertTabRect(ImplTabBarItem* pItem) const; SVT_DLLPRIVATE Rectangle ImplGetInsertTabRect(ImplTabBarItem* pItem) const;

4
svtools/source/control/tabbar.cxx
View File

@@ -1718,9 +1718,9 @@ void TabBar::ActivatePage()
long TabBar::ImplDeactivatePage() bool TabBar::ImplDeactivatePage()
{ {
long nRet = DeactivatePage(); bool nRet = DeactivatePage();
CallEventListeners( VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)) ); CallEventListeners( VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)) );