diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 0d4eb1654d16..06ef245a3bc7 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -441,7 +441,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nKey=aKeyCode.GetCode(); if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB ) { - nResult=GetParent()->Notify(rNEvt); + nResult=long(GetParent()->Notify(rNEvt)); } else { diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 63aa4a46b5fe..c2ba5316fc57 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1719,7 +1719,7 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); - long nRet = false; + bool nRet = false; if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() ) { diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index d2ef6067ee8f..7fab33cda0c5 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -185,7 +185,7 @@ public: virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); virtual sal_Bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); - virtual long Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); + virtual bool Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); virtual bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index d0b7a54445ea..6b19b91e4465 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -623,10 +623,10 @@ void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) } } -long ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin) +bool ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin) { // handle scroll commands when they arrived at child windows - long nRet = sal_False; + bool nRet = false; if( rNEvt.GetType() == EVENT_COMMAND ) { // note: dynamic_cast is not possible as GetData() returns a void* diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index b67303e345c1..df8f5ecb089c 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.cxx @@ -30,7 +30,7 @@ void NumEditAction::Action() bool NumEditAction::Notify( NotifyEvent& rNEvt ) { - long nHandled = false; + bool nHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) {