diff options
Diffstat (limited to 'sfx2/source/view')
| -rw-r--r-- | sfx2/source/view/frame2.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/view/printer.cxx | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 4eec35f809b7..bfca6b754a1e 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -73,7 +73,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void StateChanged( StateChangedType nStateChange ); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rEvt ); + virtual bool Notify( NotifyEvent& rEvt ); virtual void Resize(); virtual void GetFocus(); void DoResize(); @@ -97,10 +97,10 @@ void SfxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) pWorkWin->DataChanged_Impl( rDCEvt ); } -long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) +bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) { if ( pFrame->IsClosing_Impl() || !pFrame->GetFrameInterface().is() ) - return sal_False; + return false; SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); if ( !pView || !pView->GetObjectShell() ) @@ -117,22 +117,22 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) // if focus was on an external window, the clipboard content might have been changed pView->GetBindings().Invalidate( SID_PASTE ); pView->GetBindings().Invalidate( SID_PASTE_SPECIAL ); - return sal_True; + return true; } else if( rNEvt.GetType() == EVENT_KEYINPUT ) { if ( pView->GetViewShell()->KeyInput( *rNEvt.GetKeyEvent() ) ) - return sal_True; + return true; } else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTDISABLE*/ ) { pView->SetModalMode( sal_True ); - return sal_True; + return true; } else if ( rNEvt.GetType() == EVENT_ENDEXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTENABLE*/ ) { pView->SetModalMode( sal_False ); - return sal_True; + return true; } return Window::Notify( rNEvt ); diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 9d8c36c4e560..1e8d2bf49f7d 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -247,12 +247,12 @@ short SfxPrintOptionsDialog::Execute() //-------------------------------------------------------------------- -long SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) +bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { if ( rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_F1 && pDlgImpl->mbHelpDisabled ) - return 1; // help disabled -> <F1> does nothing + return true; // help disabled -> <F1> does nothing } return ModalDialog::Notify( rNEvt ); |