summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/app/inputwin.cxx8
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx2
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx2
-rw-r--r--sc/source/ui/inc/checklistmenu.hxx2
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx2
-rw-r--r--sc/source/ui/inc/inputwin.hxx2
-rw-r--r--sc/source/ui/inc/navipi.hxx6
-rw-r--r--sc/source/ui/navipi/navipi.cxx12
-rw-r--r--sc/source/ui/navipi/scenwnd.cxx4
9 files changed, 20 insertions, 20 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5f7b032d6132..a57d453c54de 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2481,9 +2481,9 @@ void ScPosWnd::DoEnter()
ReleaseFocus_Impl();
}
-long ScPosWnd::Notify( NotifyEvent& rNEvt )
+bool ScPosWnd::Notify( NotifyEvent& rNEvt )
{
- long nHandled = 0;
+ bool nHandled = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -2493,7 +2493,7 @@ long ScPosWnd::Notify( NotifyEvent& rNEvt )
{
case KEY_RETURN:
DoEnter();
- nHandled = 1;
+ nHandled = true;
break;
case KEY_ESCAPE:
@@ -2508,7 +2508,7 @@ long ScPosWnd::Notify( NotifyEvent& rNEvt )
SetText( aPosStr );
ReleaseFocus_Impl();
}
- nHandled = 1;
+ nHandled = true;
break;
}
}
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 61ef14b2fa93..39d21738221b 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1198,7 +1198,7 @@ void ScCheckListMenuWindow::MouseMove(const MouseEvent& rMEvt)
queueCloseSubMenu();
}
-long ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt)
+bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt)
{
switch (rNEvt.GetType())
{
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index f4e3949eeec7..1d944cab910c 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -62,7 +62,7 @@ ScCondFrmtEntry::~ScCondFrmtEntry()
{
}
-long ScCondFrmtEntry::Notify( NotifyEvent& rNEvt )
+bool ScCondFrmtEntry::Notify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
{
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index f324482fee41..e58ce8b6addf 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -239,7 +239,7 @@ public:
virtual ~ScCheckListMenuWindow();
virtual void MouseMove(const MouseEvent& rMEvt);
- virtual long Notify(NotifyEvent& rNEvt);
+ virtual bool Notify(NotifyEvent& rNEvt);
virtual void Paint(const Rectangle& rRect);
virtual Window* GetPreferredKeyInputWindow();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 806c7ce9ca7d..be9bf2833ba3 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -67,7 +67,7 @@ public:
ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos );
virtual ~ScCondFrmtEntry();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
bool IsSelected() const;
void SetIndex(sal_Int32 nIndex);
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index ff44c57ebe60..14579cdbc067 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -150,7 +150,7 @@ protected:
virtual void Select();
virtual void Modify();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 185c6e417ea3..6aacd2c8e48a 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -68,7 +68,7 @@ public:
protected:
virtual void Select();
virtual void DoubleClick();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
private:
struct ScenarioEntry
@@ -131,7 +131,7 @@ public:
void SetCol( SCCOL nColNo );
protected:
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void LoseFocus();
virtual void Up();
virtual void Down();
@@ -164,7 +164,7 @@ public:
void SetRow( SCROW nRow ){ SetValue( nRow ); }
protected:
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void LoseFocus();
private:
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index d69184451c79..4263a618d89d 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -98,9 +98,9 @@ ColumnEdit::~ColumnEdit()
//------------------------------------------------------------------------
-long ColumnEdit::Notify( NotifyEvent& rNEvt )
+bool ColumnEdit::Notify( NotifyEvent& rNEvt )
{
- long nHandled = SpinField::Notify( rNEvt );
+ bool nHandled = SpinField::Notify( rNEvt );
sal_uInt16 nType = rNEvt.GetType();
if ( nType == EVENT_KEYINPUT )
@@ -118,7 +118,7 @@ long ColumnEdit::Notify( NotifyEvent& rNEvt )
{
ScNavigatorDlg::ReleaseFocus();
ExecuteCol();
- nHandled = 1;
+ nHandled = true;
}
}
}
@@ -300,9 +300,9 @@ RowEdit::~RowEdit()
//------------------------------------------------------------------------
-long RowEdit::Notify( NotifyEvent& rNEvt )
+bool RowEdit::Notify( NotifyEvent& rNEvt )
{
- long nHandled = NumericField::Notify( rNEvt );
+ bool nHandled = NumericField::Notify( rNEvt );
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -312,7 +312,7 @@ long RowEdit::Notify( NotifyEvent& rNEvt )
{
ScNavigatorDlg::ReleaseFocus();
ExecuteRow();
- nHandled = 1;
+ nHandled = true;
}
}
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index b62298c8c048..7572edff7c2e 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -108,7 +108,7 @@ void ScScenarioListBox::DoubleClick()
SelectScenario();
}
-long ScScenarioListBox::Notify( NotifyEvent& rNEvt )
+bool ScScenarioListBox::Notify( NotifyEvent& rNEvt )
{
bool bHandled = false;
@@ -156,7 +156,7 @@ long ScScenarioListBox::Notify( NotifyEvent& rNEvt )
}
}
- return bHandled ? 1 : ListBox::Notify( rNEvt );
+ return bHandled || ListBox::Notify( rNEvt );
}
const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() const