summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-18 00:18:52 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-18 00:37:49 +0100
commit602c87b4259d118e5db6d8a990c4695103f916dd (patch)
tree1cbc6cf8309b680476f5116cd5320f8f6a99c32a /formula
parent849482c0ea88c4aa70ec56adfefe7e59b6060950 (diff)
Window::PreNotify should return bool
Change-Id: Ic9903fd887f2c3fab2630ebeb20df39392177c8d
Diffstat (limited to 'formula')
-rw-r--r--formula/source/ui/dlg/ControlHelper.hxx2
-rw-r--r--formula/source/ui/dlg/formula.cxx4
-rw-r--r--formula/source/ui/dlg/funcpage.cxx4
-rw-r--r--formula/source/ui/dlg/funcpage.hxx2
-rw-r--r--formula/source/ui/dlg/funcutl.cxx6
5 files changed, 9 insertions, 9 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 86f4f1d01c4c..fe62907592c8 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -55,7 +55,7 @@ private:
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void SelectionChanged();
virtual void Resize();
virtual void GetFocus();
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 4e2ba70725c4..2bfd9b3fdb00 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1707,7 +1707,7 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId)
}
}
-long FormulaModalDialog::PreNotify( NotifyEvent& rNEvt )
+bool FormulaModalDialog::PreNotify( NotifyEvent& rNEvt )
{
m_pImpl->PreNotify( rNEvt );
@@ -1820,7 +1820,7 @@ void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId)
}
-long FormulaDlg::PreNotify( NotifyEvent& rNEvt )
+bool FormulaDlg::PreNotify( NotifyEvent& rNEvt )
{
m_pImpl->PreNotify( rNEvt );
return SfxModelessDialog::PreNotify(rNEvt);
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index ef38e18b2bce..eef85961bee5 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -43,11 +43,11 @@ void FormulaListBox::KeyInput( const KeyEvent& rKEvt )
DoubleClick();
}
-long FormulaListBox::PreNotify( NotifyEvent& rNEvt )
+bool FormulaListBox::PreNotify( NotifyEvent& rNEvt )
{
NotifyEvent aNotifyEvt=rNEvt;
- long nResult=ListBox::PreNotify(rNEvt);
+ bool nResult = ListBox::PreNotify(rNEvt);
sal_uInt16 nSwitch=aNotifyEvt.GetType();
if(nSwitch==EVENT_KEYINPUT)
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 056c4a5a4399..eb2985b66cd4 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -47,7 +47,7 @@ class FormulaListBox : public ListBox
protected:
virtual void KeyInput( const KeyEvent& rKEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
FormulaListBox( Window* pParent, const ResId& rResId );
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 06ef245a3bc7..895fa67c767c 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -428,9 +428,9 @@ void EditBox::GetFocus()
//When an Event is cleared, this Routine is
//first called and a PostUserEvent is sent.
-long EditBox::PreNotify( NotifyEvent& rNEvt )
+bool EditBox::PreNotify( NotifyEvent& rNEvt )
{
- long nResult=sal_True;
+ bool nResult = true;
if(pMEdit==NULL) return nResult;
@@ -441,7 +441,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
sal_uInt16 nKey=aKeyCode.GetCode();
if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB )
{
- nResult=long(GetParent()->Notify(rNEvt));
+ nResult = GetParent()->Notify(rNEvt);
}
else
{