From 04683f14883f4cd64febadd71b327639f1e7edcc Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 17 Jan 2014 16:40:50 +0100
Subject: Window::Notify should return bool
Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe
---
cui/source/customize/macropg.cxx | 4 ++--
cui/source/dialogs/SpellDialog.cxx | 2 +-
cui/source/dialogs/hltpbase.cxx | 2 +-
cui/source/inc/ControlFocusHelper.hxx | 2 +-
cui/source/inc/SpellDialog.hxx | 2 +-
cui/source/inc/headertablistbox.hxx | 2 +-
cui/source/inc/hltpbase.hxx | 2 +-
cui/source/inc/treeopt.hxx | 2 +-
cui/source/options/connpooloptions.cxx | 2 +-
cui/source/options/connpooloptions.hxx | 2 +-
cui/source/options/optpath.cxx | 4 ++--
cui/source/options/treeopt.cxx | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'cui')
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 28804948ea21..511e9419febf 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -133,9 +133,9 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
return 1;
}
-long _HeaderTabListBox::Notify( NotifyEvent& rNEvt )
+bool _HeaderTabListBox::Notify( NotifyEvent& rNEvt )
{
- long nRet = Control::Notify( rNEvt );
+ bool nRet = Control::Notify( rNEvt );
if( rNEvt.GetType() == EVENT_GETFOCUS )
{
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 5eb92a36cd8a..034ada98cc9d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -979,7 +979,7 @@ IMPL_LINK_NOARG(SpellDialog, CancelHdl)
}
//-----------------------------------------------------------------------
-long SpellDialog::Notify( NotifyEvent& rNEvt )
+bool SpellDialog::Notify( NotifyEvent& rNEvt )
{
/* #i38338#
* FIXME: LoseFocus and GetFocus are signals from vcl that
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index d849ed927276..331a9ea47623 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -104,7 +104,7 @@ void SvxHyperURLBox::Modify()
{
SvtURLBox::Modify();
}
-long SvxHyperURLBox::Notify( NotifyEvent& rNEvt )
+bool SvxHyperURLBox::Notify( NotifyEvent& rNEvt )
{
return SvtURLBox::Notify( rNEvt );
}
diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx
index ef61d83621aa..d09c76b81ea0 100644
--- a/cui/source/inc/ControlFocusHelper.hxx
+++ b/cui/source/inc/ControlFocusHelper.hxx
@@ -34,7 +34,7 @@ public:
void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; }
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
#endif // INCLUDED_CUI_SOURCE_INC_CONTROLFOCUSHELPER_HXX
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 9c10a045fb5d..3cfe2ff60f2f 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -210,7 +210,7 @@ private:
void SetTitle_Impl(LanguageType nLang);
protected:
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
OUString getReplacementString() const;
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 0be8ebe0b20f..da178764035b 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -31,7 +31,7 @@ private:
SvHeaderTabListBox maListBox;
protected:
DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
public:
_HeaderTabListBox( Window* pParent, const ResId& rId );
virtual ~_HeaderTabListBox();
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index f765be926b73..874b2930365e 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -61,7 +61,7 @@ protected:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Select();
virtual void Modify();
virtual long PreNotify( NotifyEvent& rNEvt );
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index c2ea60275cc8..3f60dfdaab9c 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -200,7 +200,7 @@ protected:
DECL_LINK( HintHdl_Impl, Timer * );
void SelectHdl_Impl();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual short Execute();
public:
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index b92e271df7c9..56adb934854c 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -372,7 +372,7 @@ namespace offapp
}
//--------------------------------------------------------------------
- long ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt )
+ bool ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt )
{
if (EVENT_LOSEFOCUS == _rNEvt.GetType())
if (m_pTimeout->IsWindowOrChild(_rNEvt.GetWindow()))
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index c162ab0e4364..27397c0a462e 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -54,7 +54,7 @@ namespace offapp
static SfxTabPage* Create(Window* _pParent, const SfxItemSet& _rAttrSet);
protected:
- virtual long Notify( NotifyEvent& _rNEvt );
+ virtual bool Notify( NotifyEvent& _rNEvt );
virtual sal_Bool FillItemSet(SfxItemSet& _rSet);
virtual void Reset(const SfxItemSet& _rSet);
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index f33dde62c335..15ec74e149f3 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -164,9 +164,9 @@ OUString Convert_Impl( const OUString& rValue )
// class SvxControlFocusHelper ---------------------------------------------
-long SvxControlFocusHelper::Notify( NotifyEvent& rNEvt )
+bool SvxControlFocusHelper::Notify( NotifyEvent& rNEvt )
{
- long nRet = Control::Notify( rNEvt );
+ bool nRet = Control::Notify( rNEvt );
if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == EVENT_GETFOCUS )
m_pFocusCtrl->GrabFocus();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 6d5c27eeb0db..04e995b29613 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -882,7 +882,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
aTreeLB.GrabFocus();
}
-long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
+bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
{
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
--
cgit