Window::Notify should return bool

Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe
This commit is contained in:
Stephan Bergmann
2014-01-17 16:40:50 +01:00
parent 734cf8395d
commit 04683f1488
151 changed files with 379 additions and 396 deletions

View File

@@ -735,7 +735,7 @@ namespace svt
}
//------------------------------------------------------------------------------
long EditBrowseBox::Notify(NotifyEvent& rEvt)
bool EditBrowseBox::Notify(NotifyEvent& rEvt)
{
switch (rEvt.GetType())
{

View File

@@ -2221,7 +2221,7 @@ public:
PushButton* EnableNoneBtn( sal_Bool bEnable );
void ArrangeButtons();
long Notify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
};
// -----------------------------------------------------------------------
@@ -2376,7 +2376,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
// -----------------------------------------------------------------------
long ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
{
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{

View File

@@ -74,7 +74,7 @@ namespace svt
}
//---------------------------------------------------------------------
long FileURLBox::Notify( NotifyEvent& _rNEvt )
bool FileURLBox::Notify( NotifyEvent& _rNEvt )
{
switch ( _rNEvt.GetType() )
{
@@ -84,7 +84,7 @@ namespace svt
&& ( IsInDropDown() )
)
{
long nReturn = SvtURLBox::Notify(_rNEvt);
bool nReturn = SvtURLBox::Notify(_rNEvt);
DisplayURL( m_sPreservedText );
return nReturn;
}

View File

@@ -791,7 +791,7 @@ void FormattedField::ReFormat()
}
}
long FormattedField::Notify(NotifyEvent& rNEvt)
bool FormattedField::Notify(NotifyEvent& rNEvt)
{
DBG_CHKTHIS(FormattedField, NULL);
@@ -809,7 +809,7 @@ long FormattedField::Notify(NotifyEvent& rNEvt)
{
// the base class would translate this into calls to Up/Down/First/Last,
// but we don't want this if we are text-formatted
return 1;
return true;
}
}
}
@@ -825,7 +825,7 @@ long FormattedField::Notify(NotifyEvent& rNEvt)
// same as above : prevent the base class from doing Up/Down-calls
// (normally I should put this test into the Up/Down methods itself, shouldn't I ?)
// FS - 71553 - 19.01.00
return 1;
return true;
}
}
}

View File

@@ -1139,7 +1139,7 @@ IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl)
}
//-------------------------------------------------------------------------
long SvtURLBox::Notify( NotifyEvent &rEvt )
bool SvtURLBox::Notify( NotifyEvent &rEvt )
{
if ( EVENT_GETFOCUS == rEvt.GetType() )
{

View File

@@ -49,14 +49,14 @@ namespace svt
}
//---------------------------------------------------------------------
long OFileURLControl::Notify( NotifyEvent& _rNEvt )
bool OFileURLControl::Notify( NotifyEvent& _rNEvt )
{
if (GetSubEdit() == _rNEvt.GetWindow())
if (EVENT_KEYINPUT == _rNEvt.GetType())
if (KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode())
if (IsInDropDown())
{
long nReturn = SvtURLBox::Notify(_rNEvt);
bool nReturn = SvtURLBox::Notify(_rNEvt);
// build a system dependent (thus more user readable) file name
OFileNotation aTransformer(m_sPreservedText, OFileNotation::N_URL);

View File

@@ -311,7 +311,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl)
// -----------------------------------------------------------------------
long PrinterSetupDialog::Notify( NotifyEvent& rNEvt )
bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt )
{
if ( (rNEvt.GetType() == EVENT_GETFOCUS) && IsReallyVisible() )
ImplStatusHdl( &maStatusTimer );

View File

@@ -445,7 +445,7 @@ void WizardDialog::StateChanged( StateChangedType nType )
// -----------------------------------------------------------------------
long WizardDialog::Notify( NotifyEvent& rNEvt )
bool WizardDialog::Notify( NotifyEvent& rNEvt )
{
if ( (rNEvt.GetType() == EVENT_KEYINPUT) && mpPrevBtn && mpNextBtn )
{
@@ -466,7 +466,7 @@ long WizardDialog::Notify( NotifyEvent& rNEvt )
mpPrevBtn->SetPressed( sal_False );
mpPrevBtn->Click();
}
return sal_True;
return true;
}
}
else
@@ -480,7 +480,7 @@ long WizardDialog::Notify( NotifyEvent& rNEvt )
mpNextBtn->SetPressed( sal_False );
mpNextBtn->Click();
}
return sal_True;
return true;
}
}
}

View File

@@ -627,7 +627,7 @@ long SvResizeWindow::PreNotify( NotifyEvent& rEvt )
return Window::PreNotify(rEvt);
}
long SvResizeWindow::Notify( NotifyEvent& rEvt )
bool SvResizeWindow::Notify( NotifyEvent& rEvt )
{
if ( rEvt.GetType() == EVENT_LOSEFOCUS && m_bActive )
{

View File

@@ -91,7 +91,7 @@ public:
virtual void KeyInput( const KeyEvent & rEvt );
virtual void Resize();
virtual void Paint( const Rectangle & );
virtual long Notify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual long PreNotify( NotifyEvent& rNEvt );
void QueryObjAreaPixel( Rectangle & );

View File

@@ -209,9 +209,9 @@ namespace svt { namespace table
}
//------------------------------------------------------------------------------------------------------------------
long TableDataWindow::Notify(NotifyEvent& rNEvt )
bool TableDataWindow::Notify(NotifyEvent& rNEvt )
{
long nDone = 0;
bool nDone = false;
if ( rNEvt.GetType() == EVENT_COMMAND )
{
const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
@@ -224,7 +224,7 @@ namespace svt { namespace table
}
}
}
return nDone ? nDone : Window::Notify( rNEvt );
return nDone || Window::Notify( rNEvt );
}
//......................................................................................................................
} } // namespace svt::table

View File

@@ -58,7 +58,7 @@ namespace svt { namespace table
virtual void MouseMove( const MouseEvent& rMEvt);
virtual void MouseButtonDown( const MouseEvent& rMEvt);
virtual void MouseButtonUp( const MouseEvent& rMEvt);
virtual long Notify(NotifyEvent& rNEvt);
virtual bool Notify(NotifyEvent& rNEvt);
virtual void SetControlBackground(const Color& rColor);
virtual void SetControlBackground();
virtual void RequestHelp( const HelpEvent& rHEvt );

View File

@@ -456,7 +456,7 @@ namespace svt
}
//--------------------------------------------------------------------
long ToolPanelDeck::Notify( NotifyEvent& i_rNotifyEvent )
bool ToolPanelDeck::Notify( NotifyEvent& i_rNotifyEvent )
{
bool bHandled = false;
if ( i_rNotifyEvent.GetType() == EVENT_KEYINPUT )
@@ -496,7 +496,7 @@ namespace svt
}
if ( bHandled )
return 1;
return true;
return Control::Notify( i_rNotifyEvent );
}