[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source filter/source forms/source fpicker/source include/sfx2 include/svtools include/svx include/vcl padmin/source reportdesign/source sc/source sd/source sfx2/source svtools/source svx/source sw/source vcl/inc vcl/source
Stephan Bergmann
sbergman at redhat.com
Fri Jan 17 07:43:05 PST 2014
basctl/source/basicide/bastypes.cxx | 8 +--
basctl/source/inc/bastypes.hxx | 2
chart2/source/controller/main/ElementSelector.cxx | 8 +--
chart2/source/controller/main/ElementSelector.hxx | 2
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
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 6 +-
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 10 ++--
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6 +-
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 2
extensions/source/propctrlr/browserlistbox.hxx | 2
extensions/source/propctrlr/browserview.cxx | 4 -
extensions/source/propctrlr/browserview.hxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 10 ++--
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 4 -
forms/source/richtext/richtextvclcontrol.cxx | 6 +-
forms/source/richtext/richtextvclcontrol.hxx | 2
fpicker/source/office/iodlg.cxx | 10 ++--
fpicker/source/office/iodlg.hxx | 2
include/sfx2/basedlgs.hxx | 4 -
include/sfx2/dockwin.hxx | 2
include/sfx2/prnmon.hxx | 2
include/sfx2/sidebar/SidebarToolBox.hxx | 2
include/svtools/editbrowsebox.hxx | 2
include/svtools/fileurlbox.hxx | 2
include/svtools/fmtfield.hxx | 2
include/svtools/inettbc.hxx | 2
include/svtools/prnsetup.hxx | 2
include/svtools/toolpanel/toolpaneldeck.hxx | 2
include/svtools/urlcontrol.hxx | 2
include/svtools/wizdlg.hxx | 2
include/svx/colrctrl.hxx | 2
include/svx/itemwin.hxx | 10 ++--
include/svx/sidebar/PopupContainer.hxx | 2
include/vcl/combobox.hxx | 2
include/vcl/ctrl.hxx | 2
include/vcl/dialog.hxx | 2
include/vcl/dockwin.hxx | 2
include/vcl/field.hxx | 24 +++++------
include/vcl/floatwin.hxx | 2
include/vcl/layout.hxx | 2
include/vcl/longcurr.hxx | 4 -
include/vcl/spinfld.hxx | 2
include/vcl/split.hxx | 2
include/vcl/syswin.hxx | 2
include/vcl/tabctrl.hxx | 4 -
include/vcl/toolbox.hxx | 2
include/vcl/vclmedit.hxx | 2
include/vcl/window.hxx | 2
padmin/source/helper.cxx | 12 ++---
padmin/source/helper.hxx | 4 -
padmin/source/padialog.cxx | 2
padmin/source/padialog.hxx | 2
reportdesign/source/ui/inc/ScrollHelper.hxx | 2
reportdesign/source/ui/report/ScrollHelper.cxx | 4 -
sc/source/ui/app/inputwin.cxx | 8 +--
sc/source/ui/cctrl/checklistmenu.cxx | 2
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/inc/checklistmenu.hxx | 2
sc/source/ui/inc/condformatdlgentry.hxx | 2
sc/source/ui/inc/inputwin.hxx | 2
sc/source/ui/inc/navipi.hxx | 6 +-
sc/source/ui/navipi/navipi.cxx | 12 ++---
sc/source/ui/navipi/scenwnd.cxx | 4 -
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 2
sd/source/ui/dlg/docprev.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 6 +-
sd/source/ui/inc/Window.hxx | 2
sd/source/ui/inc/docprev.hxx | 2
sd/source/ui/inc/navigatr.hxx | 2
sd/source/ui/slideshow/showwin.cxx | 13 ------
sd/source/ui/slideshow/showwindow.hxx | 1
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 7 +--
sd/source/ui/view/sdwindow.cxx | 4 -
sfx2/source/appl/newhelp.cxx | 38 +++++++++---------
sfx2/source/appl/newhelp.hxx | 10 ++--
sfx2/source/dialog/backingwindow.cxx | 4 -
sfx2/source/dialog/backingwindow.hxx | 2
sfx2/source/dialog/basedlgs.cxx | 8 +--
sfx2/source/dialog/dockwin.cxx | 10 ++--
sfx2/source/dialog/partwnd.cxx | 2
sfx2/source/dialog/templdlg.cxx | 16 +++----
sfx2/source/inc/partwnd.hxx | 2
sfx2/source/inc/templdgi.hxx | 2
sfx2/source/sidebar/Deck.cxx | 6 --
sfx2/source/sidebar/Deck.hxx | 2
sfx2/source/sidebar/SidebarToolBox.cxx | 2
sfx2/source/sidebar/TabBar.cxx | 4 -
sfx2/source/sidebar/TabBar.hxx | 2
sfx2/source/view/frame2.cxx | 14 +++---
sfx2/source/view/printer.cxx | 4 -
svtools/source/brwbox/editbrowsebox.cxx | 2
svtools/source/control/calendar.cxx | 4 -
svtools/source/control/fileurlbox.cxx | 4 -
svtools/source/control/fmtfield.cxx | 6 +-
svtools/source/control/inettbc.cxx | 2
svtools/source/control/urlcontrol.cxx | 4 -
svtools/source/dialogs/prnsetup.cxx | 2
svtools/source/dialogs/wizdlg.cxx | 6 +-
svtools/source/hatchwindow/ipwin.cxx | 2
svtools/source/hatchwindow/ipwin.hxx | 2
svtools/source/table/tabledatawindow.cxx | 6 +-
svtools/source/table/tabledatawindow.hxx | 2
svtools/source/toolpanel/toolpaneldeck.cxx | 4 -
svx/source/form/datanavi.cxx | 6 +-
svx/source/inc/datanavi.hxx | 2
svx/source/sidebar/text/SvxSBFontNameBox.cxx | 8 +--
svx/source/sidebar/text/SvxSBFontNameBox.hxx | 2
svx/source/sidebar/tools/PopupContainer.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 8 +--
svx/source/tbxctrls/grafctrl.cxx | 10 ++--
svx/source/tbxctrls/itemwin.cxx | 38 +++++++++---------
svx/source/tbxctrls/tbcontrl.cxx | 22 +++++-----
svx/source/tbxctrls/tbunocontroller.cxx | 12 ++---
sw/source/ui/cctrl/actctrl.cxx | 6 +-
sw/source/ui/inc/actctrl.hxx | 2
sw/source/ui/inc/swuicnttab.hxx | 2
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/ribbar/workctrl.cxx | 10 ++--
vcl/inc/ilstbox.hxx | 2
vcl/source/control/combobox.cxx | 14 +++---
vcl/source/control/ctrl.cxx | 6 +-
vcl/source/control/field.cxx | 12 ++---
vcl/source/control/field2.cxx | 12 ++---
vcl/source/control/ilstbox.cxx | 6 +-
vcl/source/control/longcurr.cxx | 4 -
vcl/source/control/spinfld.cxx | 20 ++++-----
vcl/source/control/tabctrl.cxx | 14 +++---
vcl/source/edit/vclmedit.cxx | 6 +-
vcl/source/window/dialog.cxx | 6 +-
vcl/source/window/dockwin.cxx | 8 +--
vcl/source/window/floatwin.cxx | 6 +-
vcl/source/window/layout.cxx | 6 +-
vcl/source/window/split.cxx | 2
vcl/source/window/syswin.cxx | 4 -
vcl/source/window/toolbox.cxx | 4 -
vcl/source/window/window.cxx | 12 ++---
151 files changed, 379 insertions(+), 396 deletions(-)
New commits:
commit 04683f14883f4cd64febadd71b327639f1e7edcc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 17 16:40:50 2014 +0100
Window::Notify should return bool
Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index b175f21..da1cac7 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -121,9 +121,9 @@ void BaseWindow::ExecuteGlobal (SfxRequest&)
{ }
-long BaseWindow::Notify( NotifyEvent& rNEvt )
+bool BaseWindow::Notify( NotifyEvent& rNEvt )
{
- long nDone = 0;
+ bool nDone = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -140,14 +140,14 @@ long BaseWindow::Notify( NotifyEvent& rNEvt )
{
if (Shell* pShell = GetShell())
pShell->NextPage( nCode == KEY_PAGEUP );
- nDone = 1;
+ nDone = true;
}
}
break;
}
}
- return nDone ? nDone : Window::Notify( rNEvt );
+ return nDone || Window::Notify( rNEvt );
}
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index b5bb400..eb6d0ac 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -181,7 +181,7 @@ public:
virtual void ExecuteCommand (SfxRequest&);
virtual void ExecuteGlobal (SfxRequest&);
virtual void GetState (SfxItemSet&) = 0;
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void StoreData();
virtual void UpdateData();
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 55d3904..fba6fb4 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -203,9 +203,9 @@ void SelectorListBox::Select()
}
}
-long SelectorListBox::Notify( NotifyEvent& rNEvt )
+bool SelectorListBox::Notify( NotifyEvent& rNEvt )
{
- long nHandled = 0;
+ bool nHandled = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -219,7 +219,7 @@ long SelectorListBox::Notify( NotifyEvent& rNEvt )
if ( KEY_TAB == nCode )
m_bReleaseFocus = false;
else
- nHandled = 1;
+ nHandled = true;
Select();
break;
}
@@ -236,7 +236,7 @@ long SelectorListBox::Notify( NotifyEvent& rNEvt )
SelectEntryPos( GetSavedValue() );
}
- return nHandled ? nHandled : ListBox::Notify( rNEvt );
+ return nHandled || ListBox::Notify( rNEvt );
}
Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::CreateAccessible()
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index bcf5e82..4971cbb 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -51,7 +51,7 @@ class SelectorListBox : public ListBox
virtual ~SelectorListBox();
virtual void Select();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
void ReleaseFocus_Impl();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 2880494..511e941 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 5eb92a3..034ada9 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 d849ed9..331a9ea 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 ef61d83..d09c76b 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 9c10a04..3cfe2ff 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 0be8ebe..da17876 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 f765be9..874b293 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 c2ea602..3f60dfd 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 b92e271..56adb93 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 c162ab0..27397c0 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 f33dde6..15ec74e 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 6d5c27e..04e995b 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 )
{
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 012096d..6c2777e 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -130,15 +130,15 @@ namespace
virtual void DataChanged(const DataChangedEvent& rDCEvt);
public:
OTablePreviewWindow( Window* pParent, WinBits nStyle = 0 );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
OTablePreviewWindow::OTablePreviewWindow(Window* pParent, WinBits nStyle) : Window( pParent, nStyle)
{
ImplInitSettings( sal_True, sal_True, sal_True );
}
- long OTablePreviewWindow::Notify( NotifyEvent& rNEvt )
+ bool OTablePreviewWindow::Notify( NotifyEvent& rNEvt )
{
- long nRet = Window::Notify( rNEvt );
+ bool nRet = Window::Notify( rNEvt );
if ( rNEvt.GetType() == EVENT_INPUTENABLE && IsInputEnabled() )
PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput) );
return nRet;
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 67d20e0..3966b03 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -34,7 +34,7 @@ class LimitBoxImpl: public LimitBox
LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl );
virtual ~LimitBoxImpl();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
private:
LimitBoxController* m_pControl;
@@ -50,9 +50,9 @@ LimitBoxImpl::~LimitBoxImpl()
{
}
-long LimitBoxImpl::Notify( NotifyEvent& rNEvt )
+bool LimitBoxImpl::Notify( NotifyEvent& rNEvt )
{
- long nHandled = 0;
+ bool nHandled = false;
switch ( rNEvt.GetType() )
{
case EVENT_LOSEFOCUS:
@@ -76,7 +76,7 @@ long LimitBoxImpl::Notify( NotifyEvent& rNEvt )
case KEY_RETURN:
{
GrabFocusToDocument();
- nHandled = 1;
+ nHandled = true;
break;
}
case KEY_TAB:
@@ -88,7 +88,7 @@ long LimitBoxImpl::Notify( NotifyEvent& rNEvt )
break;
}
}
- return nHandled ? nHandled : LimitBox::Notify( rNEvt );
+ return nHandled || LimitBox::Notify( rNEvt );
}
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 913f53d..df4b124 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -145,7 +145,7 @@ public:
void InitFromDialog(ExtMgrDialog *pParentDialog);
virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual Size GetOptimalSize() const;
@@ -430,7 +430,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
}
//------------------------------------------------------------------------------
-long ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt )
+bool ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt )
{
bool bHandled = false;
@@ -1141,7 +1141,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl)
//------------------------------------------------------------------------------
// VCL::Window / Dialog
-long ExtMgrDialog::Notify( NotifyEvent& rNEvt )
+bool ExtMgrDialog::Notify( NotifyEvent& rNEvt )
{
bool bHandled = false;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 05f78fc..b4817ed 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -141,7 +141,7 @@ public:
ExtMgrDialog( Window * pParent, TheExtensionManager *pManager );
virtual ~ExtMgrDialog();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual sal_Bool Close();
virtual void showProgress( bool bStart );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 0ced6a1..5534a21 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -892,7 +892,7 @@ void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
}
//------------------------------------------------------------------------------
-long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
+bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
{
if ( !m_bInDelete )
DeleteRemoved();
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 73859d9..199e221 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -186,7 +186,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Paint( const Rectangle &rPaintRect );
virtual void Resize();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
const Size GetMinOutputSizePixel() const;
void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index fa6bfcc..1333185 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1265,7 +1265,7 @@ namespace pcr
}
//------------------------------------------------------------------
- long OBrowserListBox::Notify( NotifyEvent& _rNEvt )
+ bool OBrowserListBox::Notify( NotifyEvent& _rNEvt )
{
switch ( _rNEvt.GetType() )
{
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 3476041..2001034d 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -133,7 +133,7 @@ namespace pcr
sal_uInt16 CalcVisibleLines();
void EnableUpdate();
void DisableUpdate();
- long Notify( NotifyEvent& _rNEvt );
+ bool Notify( NotifyEvent& _rNEvt );
long PreNotify( NotifyEvent& _rNEvt );
void SetListener( IPropertyLineListener* _pListener );
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 05a41eb..d607134 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -91,7 +91,7 @@ namespace pcr
}
//------------------------------------------------------------------------
- long OPropertyBrowserView::Notify( NotifyEvent& _rNEvt )
+ bool OPropertyBrowserView::Notify( NotifyEvent& _rNEvt )
{
if ( EVENT_KEYINPUT == _rNEvt.GetType() )
{
@@ -101,7 +101,7 @@ namespace pcr
// silence this, we don't want to propagate this outside the property
// browser, as it will probably do harm there
// #i63285#
- return 1;
+ return true;
}
return Window::Notify( _rNEvt );
}
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 88a150f..4d5b482 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -44,7 +44,7 @@ namespace pcr
protected:
virtual void Resize();
virtual void GetFocus();
- virtual long Notify( NotifyEvent& _rNEvt );
+ virtual bool Notify( NotifyEvent& _rNEvt );
public:
OPropertyBrowserView( Window* pParent, WinBits nBits = 0);
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index c060691..0e13d7b 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1002,10 +1002,10 @@ void XMLFilterSettingsDialog::onClose()
Close();
}
-long XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt )
+bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt )
{
// Because of of tab control first call the base class.
- long nRet = ModelessDialog::Notify( rNEvt );
+ bool nRet = ModelessDialog::Notify( rNEvt );
if ( !nRet )
{
if ( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -1018,7 +1018,7 @@ long XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt )
if( nKeyCode == KEY_ESCAPE || (bMod1 && (nKeyCode == KEY_W)))
{
Close();
- return sal_True;
+ return true;
}
}
}
@@ -1385,9 +1385,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPathControl(Window *pPar
return new SvxPathControl(pParent);
}
-long SvxPathControl::Notify(NotifyEvent& rNEvt)
+bool SvxPathControl::Notify(NotifyEvent& rNEvt)
{
- long nRet = VclVBox::Notify(rNEvt);
+ bool nRet = VclVBox::Notify(rNEvt);
if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == EVENT_GETFOCUS )
m_pFocusCtrl->GrabFocus();
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 60b9983..ef17342 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -51,7 +51,7 @@ public:
XMLFilterListBox* getListBox() { return m_pFocusCtrl; }
~SvxPathControl();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
// --------------------------------------------------------------------
@@ -104,7 +104,7 @@ public:
void updateStates();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
bool isClosable();
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index c0e5828..a145f62 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -287,15 +287,15 @@ namespace frm
}
//--------------------------------------------------------------------
- long RichTextControl::Notify( NotifyEvent& _rNEvt )
+ bool RichTextControl::Notify( NotifyEvent& _rNEvt )
{
- long nDone = 0;
+ bool nDone = false;
if ( _rNEvt.GetType() == EVENT_COMMAND )
{
const CommandEvent& rEvent = *_rNEvt.GetCommandEvent();
nDone = m_pImpl->HandleCommand( rEvent );
}
- return nDone ? nDone : Control::Notify( _rNEvt );
+ return nDone || Control::Notify( _rNEvt );
}
//--------------------------------------------------------------------
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index dcbb3ee..35b5991 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -110,7 +110,7 @@ namespace frm
virtual void GetFocus();
virtual void StateChanged( StateChangedType nStateChange );
virtual long PreNotify( NotifyEvent& _rNEvt );
- virtual long Notify( NotifyEvent& _rNEvt );
+ virtual bool Notify( NotifyEvent& _rNEvt );
private:
void applyAttributes( const SfxItemSet& _rAttributesToApply );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 0e5b467..63aa4a4 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1710,7 +1710,7 @@ IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl)
//*****************************************************************************
-long SvtFileDialog::Notify( NotifyEvent& rNEvt )
+bool SvtFileDialog::Notify( NotifyEvent& rNEvt )
/* [Description]
@@ -1719,7 +1719,7 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
{
sal_uInt16 nType = rNEvt.GetType();
- long nRet = 0;
+ long nRet = false;
if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() )
{
@@ -1729,16 +1729,16 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
if ( !rKeyCode.GetModifier() &&
KEY_BACKSPACE == nCode && !_pImp->_pEdFileName->HasChildPathFocus() )
{
- nRet = 0;
+ nRet = false;
if ( !nRet && _pImp->_pBtnUp->IsEnabled() )
{
PrevLevel_Impl();
- nRet = 1;
+ nRet = true;
}
}
}
- return nRet ? nRet : ModalDialog::Notify( rNEvt );
+ return nRet || ModalDialog::Notify( rNEvt );
}
//*****************************************************************************
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 0126e17..41ffff3 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -165,7 +165,7 @@ private:
void implUpdateImages( );
protected:
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
void EnableInternet( sal_Bool bInternet );
// originally from VclFileDialog
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 56ddacd..def7d09 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -114,7 +114,7 @@ protected:
public:
virtual void FillInfo(SfxChildWinInfo&) const;
void Initialize (SfxChildWinInfo* pInfo);
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
SfxBindings& GetBindings()
{ return *pBindings; }
@@ -148,7 +148,7 @@ protected:
virtual sal_Bool Close();
virtual void Resize();
virtual void Move();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
SfxBindings& GetBindings()
{ return *pBindings; }
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index bc5d3b0..333bdc4 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -98,7 +98,7 @@ public:
void SetMinOutputSizePixel( const Size& rSize );
Size GetMinOutputSizePixel() const;
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void FadeIn( sal_Bool );
void AutoShow( sal_Bool bShow = sal_True );
DECL_LINK(TimerHdl, void *);
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index c160ba6..1d85754 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -48,7 +48,7 @@ public:
sal_Bool Construct();
virtual short Execute();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
SfxTabPage* GetTabPage() const { return pPage; }
const SfxItemSet& GetOptions() const { return *pOptions; }
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 87f015f..c0e86e0 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -52,7 +52,7 @@ public:
virtual void Paint (const Rectangle& rRect);
- virtual long Notify (NotifyEvent& rEvent);
+ virtual bool Notify (NotifyEvent& rEvent);
cssu::Reference<css::frame::XToolbarController> GetControllerForItemId (
const sal_uInt16 nItemId) const;
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 517d61c..e28513e 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -529,7 +529,7 @@ namespace svt
using BrowseBox::MouseButtonDown;
virtual long PreNotify(NotifyEvent& rNEvt );
- virtual long Notify(NotifyEvent& rNEvt);
+ virtual bool Notify(NotifyEvent& rNEvt);
virtual void EndScroll();
diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx
index 5c8274a..7ff42f5 100644
--- a/include/svtools/fileurlbox.hxx
+++ b/include/svtools/fileurlbox.hxx
@@ -41,7 +41,7 @@ namespace svt
protected:
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
public:
/** transforms the given URL content into a system-dependent notation, if possible, and
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 7137f55..fbc882ed 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -235,7 +235,7 @@ public:
bool IsUsingInputStringForFormatting() const;
protected:
- virtual long Notify(NotifyEvent& rNEvt);
+ virtual bool Notify(NotifyEvent& rNEvt);
void impl_Modify(bool makeValueDirty = true);
virtual void Modify();
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 9065169..dfa15ca 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -52,7 +52,7 @@ friend class SvtURLBox_Impl;
SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID);
protected:
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Select();
virtual void Modify();
virtual long PreNotify( NotifyEvent& rNEvt );
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 593b95e..1d43f2f 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -66,7 +66,7 @@ public:
Printer* GetPrinter() const { return mpPrinter; }
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual short Execute();
diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx
index 3ad4fcd..c4ed250 100644
--- a/include/svtools/toolpanel/toolpaneldeck.hxx
+++ b/include/svtools/toolpanel/toolpaneldeck.hxx
@@ -171,7 +171,7 @@ namespace svt
protected:
// Window overridables
virtual void Resize();
- virtual long Notify( NotifyEvent& i_rNotifyEvent );
+ virtual bool Notify( NotifyEvent& i_rNotifyEvent );
virtual void GetFocus();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx
index 2bc4d85..155094e 100644
--- a/include/svtools/urlcontrol.hxx
+++ b/include/svtools/urlcontrol.hxx
@@ -41,7 +41,7 @@ namespace svt
protected:
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
//.........................................................................
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 7c0304c..f80a25a 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -258,7 +258,7 @@ public:
virtual void Resize();
virtual void StateChanged( StateChangedType nStateChange );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void ActivatePage();
virtual long DeactivatePage();
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index 41005d6..cf5b596 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -111,7 +111,7 @@ public:
void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight )
{ nLeftSlot = nLeft; nRightSlot = nRight; }
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
#endif
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 6cca82d..66a8da9 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -56,7 +56,7 @@ public:
protected:
virtual void Select();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
@@ -88,7 +88,7 @@ public:
protected:
virtual void Select();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
@@ -113,7 +113,7 @@ protected:
virtual void Up(); // just to be sure
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
@@ -140,7 +140,7 @@ public:
protected:
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
private:
sal_uInt16 nCurPos;
@@ -162,7 +162,7 @@ public:
protected:
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Select();
private:
diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx
index 6305124..64cb2b7 100644
--- a/include/svx/sidebar/PopupContainer.hxx
+++ b/include/svx/sidebar/PopupContainer.hxx
@@ -36,7 +36,7 @@ public:
PopupContainer (Window* pParent);
virtual ~PopupContainer (void);
- virtual long Notify (NotifyEvent& rNEvt);
+ virtual bool Notify (NotifyEvent& rNEvt);
};
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 6cd3d5c..81849c4 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -97,7 +97,7 @@ public:
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void Resize();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 0a5fdf9..9452793 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -130,7 +130,7 @@ public:
virtual void GetFocus();
virtual void LoseFocus();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nStateChange );
virtual void Resize();
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 1e9c6c9..04279b6 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -95,7 +95,7 @@ public:
explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
virtual ~Dialog();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index ef28316..9d9c6f4 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -296,7 +296,7 @@ public:
virtual void Resizing( Size& rSize );
virtual sal_Bool Close();
virtual void Tracking( const TrackingEvent& rTEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index aa591a8..b75b4dd 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -487,7 +487,7 @@ public:
virtual ~PatternField();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Modify();
};
@@ -507,7 +507,7 @@ public:
virtual ~NumericField();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual Size CalcMinimumSize() const;
@@ -537,7 +537,7 @@ public:
virtual ~MetricField();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual Size CalcMinimumSize() const;
@@ -605,7 +605,7 @@ public:
~CurrencyField();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void Modify();
@@ -637,7 +637,7 @@ public:
virtual ~DateField();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void Modify();
@@ -673,7 +673,7 @@ public:
virtual ~TimeField();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void Modify();
@@ -703,7 +703,7 @@ public:
~PatternBox();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Modify();
@@ -725,7 +725,7 @@ public:
virtual Size CalcMinimumSize() const;
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void Modify();
@@ -747,7 +747,7 @@ public:
virtual ~MetricBox();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual Size CalcMinimumSize() const;
@@ -781,7 +781,7 @@ public:
virtual ~CurrencyBox();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void Modify();
@@ -802,7 +802,7 @@ public:
virtual ~DateBox();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void Modify();
@@ -822,7 +822,7 @@ public:
virtual ~TimeBox();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void Modify();
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 9a9dbdc..a3ece25 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -120,7 +120,7 @@ public:
explicit FloatingWindow( Window* pParent, const ResId& );
virtual ~FloatingWindow();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 6c9e355..3ea8d31 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -567,7 +567,7 @@ protected:
virtual void setAllocation(const Size &rAllocation);
DECL_LINK(ScrollBarHdl, void *);
void InitScrollBars(const Size &rRequest);
- virtual long Notify(NotifyEvent& rNEvt);
+ virtual bool Notify(NotifyEvent& rNEvt);
private:
bool m_bUserManagedScrolling;
ScrollBar m_aVScroll;
diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index d3b7078..be53773 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -93,7 +93,7 @@ public:
~LongCurrencyField();
long PreNotify( NotifyEvent& rNEvt );
- long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
void Modify();
void Up();
@@ -120,7 +120,7 @@ public:
~LongCurrencyBox();
long PreNotify( NotifyEvent& rNEvt );
- long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
void Modify();
void ReformatAll();
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 9e51a6f..d987743 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -61,7 +61,7 @@ private:
protected:
explicit SpinField( WindowType nTyp );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Command( const CommandEvent& rCEvt );
void EndDropDown();
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 932fd2c..c5b97a7 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -79,7 +79,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void GetFocus();
virtual void LoseFocus();
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 6631944..c26c637 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -175,7 +175,7 @@ protected:
public:
~SystemWindow();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual long PreNotify( NotifyEvent& rNEvt );
virtual sal_Bool Close();
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 280006f..e253440 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -73,7 +73,7 @@ private:
SAL_DLLPRIVATE void ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout = false, bool bFirstInGroup = false, bool bLastInGroup = false, bool bIsCurrentItem = false );
SAL_DLLPRIVATE void ImplPaint( const Rectangle& rRect, bool bLayout = false );
SAL_DLLPRIVATE void ImplFreeLayoutData();
- SAL_DLLPRIVATE long ImplHandleKeyEvent( const KeyEvent& rKeyEvent );
+ SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent );
DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, void* );
DECL_DLLPRIVATE_LINK( ImplWindowEventListener, VclSimpleEvent* );
@@ -103,7 +103,7 @@ public:
virtual void LoseFocus();
virtual void RequestHelp( const HelpEvent& rHEvt );
virtual void Command( const CommandEvent& rCEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual long PreNotify( NotifyEvent& rNEvt );
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 2b53572..e7668b8 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -320,7 +320,7 @@ public:
virtual void Move();
virtual void Resize();
virtual void RequestHelp( const HelpEvent& rHEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Command( const CommandEvent& rCEvt );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index e1c69e3..ef12a37 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -48,7 +48,7 @@ protected:
void StateChanged( StateChangedType nType );
void DataChanged( const DataChangedEvent& rDCEvt );
virtual long PreNotify( NotifyEvent& rNEvt );
- long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
using Control::ImplInitSettings;
void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
WinBits ImplInitStyle( WinBits nStyle );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 991daf6..14d2b69 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -598,7 +598,7 @@ public:
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual Window* GetPreferredKeyInputWindow();
/*virtual*/ void AddEventListener( const Link& rEventListener );
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 023923a..30f1af7 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -140,15 +140,15 @@ void padmin::FindFiles( const OUString& rDirectory, ::std::list< OUString >& rRe
* DelMultiListBox
*/
-long DelMultiListBox::Notify( NotifyEvent& rEvent )
+bool DelMultiListBox::Notify( NotifyEvent& rEvent )
{
- long nRet = 0;
+ bool nRet = false;
if( rEvent.GetType() == EVENT_KEYINPUT &&
rEvent.GetKeyEvent()->GetKeyCode().GetCode() == KEY_DELETE )
{
m_aDelPressedLink.Call( this );
- nRet = 1;
+ nRet = true;
}
else
nRet = MultiListBox::Notify( rEvent );
@@ -160,15 +160,15 @@ long DelMultiListBox::Notify( NotifyEvent& rEvent )
* DelListBox
*/
-long DelListBox::Notify( NotifyEvent& rEvent )
+bool DelListBox::Notify( NotifyEvent& rEvent )
{
- long nRet = 0;
+ bool nRet = false;
if( rEvent.GetType() == EVENT_KEYINPUT &&
rEvent.GetKeyEvent()->GetKeyCode().GetCode() == KEY_DELETE )
{
m_aDelPressedLink.Call( this );
- nRet = 1;
+ nRet = true;
}
else
nRet = ListBox::Notify( rEvent );
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index ea0babe..d229766 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -49,7 +49,7 @@ public:
MultiListBox( pParent, rResId ) {}
~DelMultiListBox() {}
- virtual long Notify( NotifyEvent& rEvent );
+ virtual bool Notify( NotifyEvent& rEvent );
Link setDelPressedLink( const Link& rLink )
{
@@ -68,7 +68,7 @@ public:
ListBox( pParent, rResId ) {}
~DelListBox() {}
- virtual long Notify( NotifyEvent& rEvent );
+ virtual bool Notify( NotifyEvent& rEvent );
Link setDelPressedLink( const Link& rLink )
{
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 2685e2d..fa20fa2 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -147,7 +147,7 @@ PADialog::~PADialog()
freePadminRC();
}
-long PADialog::Notify( NotifyEvent& rEv )
+bool PADialog::Notify( NotifyEvent& rEv )
{
if( IsVisible() &&
(rEv.GetType() == EVENT_GETFOCUS || rEv.GetType() == EVENT_LOSEFOCUS )
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 031cab8..6dd6834 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -88,7 +88,7 @@ namespace padmin {
void PrintTestPage();
void updateSettings();
- virtual long Notify( NotifyEvent& rEv );
+ virtual bool Notify( NotifyEvent& rEv );
virtual void DataChanged( const DataChangedEvent& rEv );
OUString getSelectedDevice();
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index c2b0816..51e178a 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -68,7 +68,7 @@ namespace rptui
virtual void DataChanged( const DataChangedEvent& rDCEvt );
// window
virtual void Resize();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
// OPropertyChangeListener
virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException);
public:
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index ca153c5..ac9ae7a 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -317,7 +317,7 @@ void OScrollWindowHelper::collapseSections(const uno::Sequence< ::com::sun::star
m_aReportWindow.collapseSections(_aCollpasedSections);
}
//------------------------------------------------------------------------------
-long OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
+bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
{
const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent();
if ( pCommandEvent &&
@@ -334,7 +334,7 @@ long OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
pVScrBar = &m_aVScroll;
if ( HandleScrollCommand( *pCommandEvent, pHScrBar, pVScrBar ) )
- return 1L;
+ return true;
}
return OScrollWindowHelper_BASE::Notify(rNEvt);
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5f7b032..a57d453 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 61ef14b..39d2173 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 f4e3949..1d944ca 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 f324482..e58ce8b 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 806c7ce..be9bf28 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 ff44c57..14579cd 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 185c6e4..6aacd2c 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 d691844..4263a61 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 b62298c..7572edf 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
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index a47f45a..4964e43 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -593,7 +593,7 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt )
}
//------------------------------------------------------------------------------
-long ClientBox::Notify( NotifyEvent& rNEvt )
+bool ClientBox::Notify( NotifyEvent& rNEvt )
{
if ( !m_bInDelete )
DeleteRemoved();
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index d4f754f..9c5ca8f 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -146,7 +146,7 @@ public:
void Paint( const Rectangle &rPaintRect );
void Resize();
Size GetOptimalSize() const;
- long Notify( NotifyEvent& rNEvt );
+ bool Notify( NotifyEvent& rNEvt );
const Size GetMinOutputSizePixel() const;
void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index b13bf51..e7e0c76 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -171,7 +171,7 @@ void SdDocPreviewWin::startPreview()
}
}
-long SdDocPreviewWin::Notify( NotifyEvent& rNEvt )
+bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt )
{
if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
{
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index a5cb425..b3a80b8 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -782,10 +782,10 @@ NavDocInfo* SdNavigatorWin::GetDocInfo()
/**
* PreNotify
*/
-long SdNavigatorWin::Notify(NotifyEvent& rNEvt)
+bool SdNavigatorWin::Notify(NotifyEvent& rNEvt)
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
- long nOK = sal_False;
+ bool nOK = false;
if( pKEvt )
{
@@ -794,7 +794,7 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt)
if( SdPageObjsTLB::IsInDrag() )
{
// during drag'n'drop we just stop the drag but do not close the navigator
- nOK = sal_True;
+ nOK = true;
}
else
{
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 4aa5fdd..7571f73 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -180,7 +180,7 @@ protected:
virtual void Command(const CommandEvent& rCEvt);
virtual void RequestHelp( const HelpEvent& rEvt );
virtual void LoseFocus();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
/** Create an accessibility object that makes this window accessible.
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index 6e95931..7895129 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -67,7 +67,7 @@ public:
virtual void Resize();
void startPreview();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; }
const Link& GetClickHdl() const { return aClickHdl; }
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 68d6bc9..2a9b910 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -110,7 +110,7 @@ public:
protected:
virtual void Resize();
- virtual long Notify(NotifyEvent& rNEvt);
+ virtual bool Notify(NotifyEvent& rNEvt);
private:
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 4138c19..4d1c548 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -281,19 +281,6 @@ void ShowWindow::Paint(const Rectangle& rRect)
}
}
-
-long ShowWindow::Notify(NotifyEvent& rNEvt)
-{
- long nOK = sal_False;
- if (!nOK)
- nOK = Window::Notify(rNEvt);
-
- return nOK;
-}
-
-
-// -----------------------------------------------------------------------------
-
void ShowWindow::GetFocus()
{
// base class
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index 41c0c31..0acf993 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -77,7 +77,6 @@ public:
virtual void MouseButtonUp(const MouseEvent& rMEvt);
virtual void MouseButtonDown(const MouseEvent& rMEvt);
virtual void Paint(const Rectangle& rRect);
- virtual long Notify(NotifyEvent& rNEvt);
//Overload the sd::Window's CreateAccessible to create a different accessible object
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 88321d7..1ec3f11 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -60,7 +60,7 @@ public:
virtual void MouseButtonUp (const MouseEvent& rEvent);
virtual void MouseButtonDown (const MouseEvent& rEvent);
virtual void Command (const CommandEvent& rEvent);
- virtual long Notify (NotifyEvent& rEvent);
+ virtual bool Notify (NotifyEvent& rEvent);
private:
SlideSorter& mrSlideSorter;
@@ -673,10 +673,9 @@ void ContentWindow::Command(const CommandEvent& rEvent)
-long ContentWindow::Notify (NotifyEvent& rEvent)
+bool ContentWindow::Notify (NotifyEvent&)
{
- (void)rEvent;
- return 0;
+ return false;
}
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index a8ddedf..158ae91 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -295,9 +295,9 @@ void Window::Command(const CommandEvent& rCEvt)
}
-long Window::Notify( NotifyEvent& rNEvt )
+bool Window::Notify( NotifyEvent& rNEvt )
{
- long nResult = sal_False;
+ bool nResult = false;
if ( mpViewShell )
{
nResult = mpViewShell->Notify(rNEvt, this);
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 77e7362..f0314e5 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -387,17 +387,17 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent )
// -----------------------------------------------------------------------
-long ContentListBox_Impl::Notify( NotifyEvent& rNEvt )
+bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt )
{
- sal_Bool bHandled = sal_False;
+ bool bHandled = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT &&
KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
{
GetDoubleClickHdl().Call( NULL );
- bHandled = sal_True;
+ bHandled = true;
}
- return bHandled ? 1 : SvTreeListBox::Notify( rNEvt );
+ return bHandled || SvTreeListBox::Notify( rNEvt );
}
// -----------------------------------------------------------------------
@@ -494,17 +494,17 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
// -----------------------------------------------------------------------
-long IndexBox_Impl::Notify( NotifyEvent& rNEvt )
+bool IndexBox_Impl::Notify( NotifyEvent& rNEvt )
{
- sal_Bool bHandled = sal_False;
+ bool bHandled = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT &&
KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
{
GetDoubleClickHdl().Call( NULL );
- bHandled = sal_True;
+ bHandled = true;
}
- return bHandled ? 1 : ComboBox::Notify( rNEvt );
+ return bHandled || ComboBox::Notify( rNEvt );
}
// -----------------------------------------------------------------------
@@ -931,17 +931,17 @@ void SearchBox_Impl::Select()
// class SearchResultsBox_Impl -------------------------------------------
-long SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt )
+bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt )
{
- sal_Bool bHandled = sal_False;
+ bool bHandled = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT &&
KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
{
GetDoubleClickHdl().Call( NULL );
- bHandled = sal_True;
+ bHandled = true;
}
- return bHandled ? 1 : ListBox::Notify( rNEvt );
+ return bHandled || ListBox::Notify( rNEvt );
}
// class SearchTabPage_Impl ----------------------------------------------
@@ -1308,9 +1308,9 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
// -----------------------------------------------------------------------
-long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
+bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
{
- long nRet = 0;
+ bool nRet = false;
sal_uInt16 nType = rNEvt.GetType();
if ( EVENT_KEYINPUT == nType )
{
@@ -1318,12 +1318,12 @@ long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
if ( KEY_DELETE == nCode && GetEntryCount() > 0 )
{
DoAction( MID_DELETE );
- nRet = 1;
+ nRet = true;
}
else if ( KEY_RETURN == nCode )
{
GetDoubleClickHdl().Call( NULL );
- nRet = 1;
+ nRet = true;
}
}
else if ( EVENT_COMMAND == nType )
@@ -1335,11 +1335,11 @@ long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
sal_uInt16 nId = aMenu.Execute( this, pCEvt->GetMousePosPixel() );
if ( nId != MENU_ITEM_NOTFOUND )
DoAction( nId );
- nRet = 1;
+ nRet = true;
}
}
- return nRet ? nRet : ListBox::Notify( rNEvt );
+ return nRet || ListBox::Notify( rNEvt );
}
// class BookmarksTabPage_Impl -------------------------------------------
@@ -1989,7 +1989,7 @@ TextWin_Impl::~TextWin_Impl()
{
}
-long TextWin_Impl::Notify( NotifyEvent& rNEvt )
+bool TextWin_Impl::Notify( NotifyEvent& rNEvt )
{
if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_TAB )
return GetParent()->Notify( rNEvt );
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 0ebbcf6..3a5226a 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -85,7 +85,7 @@ public:
virtual void RequestingChildren( SvTreeListEntry* pParent );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); }
OUString GetSelectEntry() const;
@@ -133,7 +133,7 @@ public:
IndexBox_Impl( Window* pParent, const ResId& rResId );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
void SelectExecutableEntry();
};
@@ -207,7 +207,7 @@ class SearchResultsBox_Impl : public ListBox
public:
SearchResultsBox_Impl( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) {}
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
class SearchTabPage_Impl : public HelpTabPage_Impl
@@ -264,7 +264,7 @@ public:
BookmarksBox_Impl( Window* pParent, const ResId& rResId );
~BookmarksBox_Impl();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
class BookmarksTabPage_Impl : public HelpTabPage_Impl
@@ -419,7 +419,7 @@ public:
TextWin_Impl( Window* pParent );
virtual ~TextWin_Impl();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
// class SfxHelpTextWindow_Impl ------------------------------------------
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 8744b07..988a4a3 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -305,7 +305,7 @@ void BackingWindow::Paint( const Rectangle& )
aDev );
}
-long BackingWindow::Notify( NotifyEvent& rNEvt )
+bool BackingWindow::Notify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -319,7 +319,7 @@ long BackingWindow::Notify( NotifyEvent& rNEvt )
const KeyEvent* pEvt = rNEvt.GetKeyEvent();
const KeyCode& rKeyCode(pEvt->GetKeyCode());
if( pEvt && mpAccExec->execute(rKeyCode) )
- return 1;
+ return true;
}
return Window::Notify( rNEvt );
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 948265f..526a91b 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -107,7 +107,7 @@ public:
virtual void Paint( const Rectangle& rRect );
virtual void Resize();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual Size GetOptimalSize() const;
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 25998b0..6280864 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -354,7 +354,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW)
// -----------------------------------------------------------------------
-long SfxModelessDialog::Notify( NotifyEvent& rEvt )
+bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
/* [Description]
@@ -379,7 +379,7 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt )
if ( !ModelessDialog::Notify( rEvt ) && SfxViewShell::Current() )
// then also for valid global accelerators.
return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() );
- return sal_True;
+ return true;
}
return ModelessDialog::Notify( rEvt );
@@ -442,7 +442,7 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const
// -----------------------------------------------------------------------
-long SfxFloatingWindow::Notify( NotifyEvent& rEvt )
+bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
/* [Description]
@@ -470,7 +470,7 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt )
if ( !FloatingWindow::Notify( rEvt ) && SfxViewShell::Current() )
// then also for valid global accelerators.
return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() );
- return sal_True;
+ return true;
}
return FloatingWindow::Notify( rEvt );
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 2eb6bed..72f95bc 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -79,7 +79,7 @@ public:
void SetWrappedWindow(Window* const pWindow);
virtual void StateChanged( StateChangedType nType );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual void Resize();
virtual void Resizing( Size& rSize );
virtual sal_Bool Close();
@@ -269,7 +269,7 @@ void SfxTitleDockingWindow::SetWrappedWindow( Window* const pWindow )
}
}
-long SfxTitleDockingWindow::Notify( NotifyEvent& rNEvt )
+bool SfxTitleDockingWindow::Notify( NotifyEvent& rNEvt )
{
return SfxDockingWindow::Notify( rNEvt );
}
@@ -1770,7 +1770,7 @@ Size SfxDockingWindow::GetMinOutputSizePixel() const
//-------------------------------------------------------------------------
-long SfxDockingWindow::Notify( NotifyEvent& rEvt )
+bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
{
if ( rEvt.GetType() == EVENT_GETFOCUS )
{
@@ -1786,7 +1786,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
// base class, otherwise the parent learns nothing
// if ( rEvt.GetWindow() == this ) PB: #i74693# not necessary any longer
DockingWindow::Notify( rEvt );
- return sal_True;
+ return true;
}
else if( rEvt.GetType() == EVENT_KEYINPUT )
{
@@ -1794,7 +1794,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
if ( !DockingWindow::Notify( rEvt ) && SfxViewShell::Current() )
// then also for valid global accelerators.
return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() );
- return sal_True;
+ return true;
}
else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
{
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index fb0058f..a0de0f5 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -178,7 +178,7 @@ sal_Bool SfxPartDockWnd_Impl::QueryClose()
//****************************************************************************
-long SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt )
+bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt )
{
if( rEvt.GetType() == EVENT_GETFOCUS )
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 067eae9..2a97159 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -302,9 +302,9 @@ IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop)
return 0;
}
-long DropListBox_Impl::Notify( NotifyEvent& rNEvt )
+bool DropListBox_Impl::Notify( NotifyEvent& rNEvt )
{
- long nRet = 0;
+ bool nRet = false;
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
@@ -313,12 +313,12 @@ long DropListBox_Impl::Notify( NotifyEvent& rNEvt )
if( pDialog->bCanDel && KEY_DELETE == rKeyCode.GetCode())
{
pDialog->DeleteHdl( NULL );
- nRet = 1;
+ nRet = true;
}
else if( KEY_RETURN == rKeyCode.GetCode())
{
GetDoubleClickHdl().Call(this);
- nRet = 1;
+ nRet = true;
}
}
}
@@ -524,7 +524,7 @@ private:
protected:
virtual void Command( const CommandEvent& rMEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
virtual sal_Bool DoubleClickHdl();
virtual bool ExpandingHdl();
virtual void ExpandedHdl();
@@ -592,18 +592,18 @@ void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt )
//-------------------------------------------------------------------------
-long StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
+bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
{
// handle <RETURN> as double click
- long nRet = 0;
+ bool nRet = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
if ( !rKeyCode.GetModifier() && KEY_RETURN == rKeyCode.GetCode() )
{
aDoubleClickLink.Call( this );
- nRet = 1;
+ nRet = true;
}
}
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index 7dd9461..0ecf7e5 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -61,7 +61,7 @@ class SfxPartDockWnd_Impl : public SfxDockingWindow
{
protected:
virtual void Resize();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
public:
SfxPartDockWnd_Impl( SfxBindings* pBindings,
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 0011aed..3520a5b 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -73,7 +73,7 @@ public:
sal_uInt16 GetModifier() const { return nModifier; }
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
};
// class SfxActionListBox ------------------------------------------------
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 3d0f43c..0df23ae 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -197,7 +197,7 @@ void Deck::DataChanged (const DataChangedEvent& rEvent)
-long Deck::Notify (NotifyEvent& rEvent)
+bool Deck::Notify (NotifyEvent& rEvent)
{
if (rEvent.GetType() == EVENT_COMMAND)
{
@@ -206,9 +206,7 @@ long Deck::Notify (NotifyEvent& rEvent)
switch (pCommandEvent->GetCommand())
{
case COMMAND_WHEEL:
- return ProcessWheelEvent(pCommandEvent, rEvent)
- ? sal_True
- : sal_False;
+ return ProcessWheelEvent(pCommandEvent, rEvent);
default:
break;
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index 33eff61..fb382a5 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -67,7 +67,7 @@ public:
virtual void Paint (const Rectangle& rUpdateArea);
virtual void DataChanged (const DataChangedEvent& rEvent);
- virtual long Notify (NotifyEvent& rEvent);
+ virtual bool Notify (NotifyEvent& rEvent);
void PrintWindowTree (void);
void PrintWindowTree (const ::std::vector<Panel*>& rPanels);
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 95cf7d2..70eba9c 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -118,7 +118,7 @@ void SidebarToolBox::Paint (const Rectangle& rRect)
-long SidebarToolBox::Notify (NotifyEvent& rEvent)
+bool SidebarToolBox::Notify (NotifyEvent& rEvent)
{
if (rEvent.GetType() == EVENT_KEYINPUT)
{
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 353a2bb..27f451b 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -277,9 +277,9 @@ void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent)
-long TabBar::Notify (NotifyEvent&)
+bool TabBar::Notify (NotifyEvent&)
{
- return sal_False;
+ return false;
}
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 20d4cc9..01073ce6 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -74,7 +74,7 @@ public:
virtual void Paint (const Rectangle& rUpdateArea);
virtual void DataChanged (const DataChangedEvent& rDataChangedEvent);
- virtual long Notify (NotifyEvent& rEvent);
+ virtual bool Notify (NotifyEvent& rEvent);
static sal_Int32 GetDefaultWidth (void);
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 4eec35f..bfca6b7 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 9d8c36c..1e8d2bf 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 );
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index d4dada7..79a98c2 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -735,7 +735,7 @@ namespace svt
}
//------------------------------------------------------------------------------
- long EditBrowseBox::Notify(NotifyEvent& rEvt)
+ bool EditBrowseBox::Notify(NotifyEvent& rEvt)
{
switch (rEvt.GetType())
{
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 38fd65f..ca9171b 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -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 )
{
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index b027922..c13dd2b 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -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;
}
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 551da37..a0742b5 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -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;
}
}
}
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 4cbe2a6..5ab9dba 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -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() )
{
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index ee62f1b..8576500 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -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);
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 90f2e53..a493c71 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -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 );
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 153a29e..51bbd19 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -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;
}
}
}
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index b9551ec..4a603a8 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -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 )
{
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index a2703b0..7942562 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -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 & );
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 65703e5..9970338 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -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
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index 4a7a771..594831d 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -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 );
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 92cbc87..2653de0 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -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 );
}
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 200fc87..a2b26ef 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -987,9 +987,9 @@ namespace svxform
}
//------------------------------------------------------------------------
- long XFormsPage::Notify( NotifyEvent& rNEvt )
+ bool XFormsPage::Notify( NotifyEvent& rNEvt )
{
- long nHandled = 0;
+ bool nHandled = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -1003,7 +1003,7 @@ namespace svxform
}
}
- return nHandled ? nHandled : Window::Notify( rNEvt );
+ return nHandled || Window::Notify( rNEvt );
}
//------------------------------------------------------------------------
void XFormsPage::Resize()
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 11216aa..a1f65a8 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -267,7 +267,7 @@ namespace svxform
bool RemoveEntry();
protected:
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
public:
XFormsPage( Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup );
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
index b94c613..27cd2a4 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
@@ -130,24 +130,24 @@ long SvxSBFontNameBox::PreNotify( NotifyEvent& rNEvt )
return FontNameBox::PreNotify( rNEvt );
}
//<<modify
-long SvxSBFontNameBox::Notify( NotifyEvent& rNEvt) //SfxBroadcaster& rBC, const SfxHint& rHint
+bool SvxSBFontNameBox::Notify( NotifyEvent& rNEvt) //SfxBroadcaster& rBC, const SfxHint& rHint
{
//SfxItemSetHint* pHint = PTR_CAST(SfxItemSetHint, &rHint);
//if ( pHint )
// EnableControls_Impl();
- bool bHandle = 0;
+ bool bHandle = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
const sal_uInt16 nCode (rNEvt.GetKeyEvent()->GetKeyCode().GetCode());
if( nCode == KEY_RETURN)
{
- bHandle = 1;
+ bHandle = true;
Select();
}
}
- return bHandle ? bHandle : FontNameBox::Notify( rNEvt );
+ return bHandle || FontNameBox::Notify( rNEvt );
}
void SvxSBFontNameBox::Select()
{
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
index c7af9ed..1202646 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
@@ -51,7 +51,7 @@ public:
nFtCount = pList->GetFontNameCount(); }
void SetBindings(SfxBindings* pBinding);//
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );//
+ virtual bool Notify( NotifyEvent& rNEvt );//
};
} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx
index 3ff8ad4..7ac4e95 100644
--- a/svx/source/sidebar/tools/PopupContainer.cxx
+++ b/svx/source/sidebar/tools/PopupContainer.cxx
@@ -36,7 +36,7 @@ PopupContainer::~PopupContainer (void)
-long PopupContainer::Notify (NotifyEvent& rEvent)
+bool PopupContainer::Notify (NotifyEvent& rEvent)
{
if (rEvent.GetType() == EVENT_LOSEFOCUS)
{
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index da6c87b..fb0c17b 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -580,9 +580,9 @@ void SvxColorDockingWindow::GetFocus (void)
aColorSet.GrabFocus();
}
-long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )
+bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )
{
- long nRet = 0;
+ bool nRet = false;
if( ( rNEvt.GetType() == EVENT_KEYINPUT ) )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
@@ -591,12 +591,12 @@ long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )
{
case KEY_ESCAPE:
GrabFocusToDocument();
- nRet = 1;
+ nRet = true;
break;
}
}
- return nRet ? nRet : SfxDockingWindow::Notify( rNEvt );
+ return nRet || SfxDockingWindow::Notify( rNEvt );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 200c8a3..5c5c46e 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -319,7 +319,7 @@ private:
virtual void Select();
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual bool Notify( NotifyEvent& rNEvt );
void ImplReleaseFocus();
public:
@@ -379,9 +379,9 @@ long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt )
return ListBox::PreNotify( rNEvt );
}
-long ImplGrafModeControl::Notify( NotifyEvent& rNEvt )
+bool ImplGrafModeControl::Notify( NotifyEvent& rNEvt )
{
- long nHandled = ListBox::Notify( rNEvt );
+ bool nHandled = ListBox::Notify( rNEvt );
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -392,7 +392,7 @@ long ImplGrafModeControl::Notify( NotifyEvent& rNEvt )
case KEY_RETURN:
{
Select();
- nHandled = 1;
+ nHandled = true;
}
break;
@@ -400,7 +400,7 @@ long ImplGrafModeControl::Notify( NotifyEvent& rNEvt )
{
SelectEntryPos( mnCurPos );
ImplReleaseFocus();
- nHandled = 1;
+ nHandled = true;
}
break;
}
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 5cc75f6..427b635 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -186,9 +186,9 @@ long SvxLineBox::PreNotify( NotifyEvent& rNEvt )
// -----------------------------------------------------------------------
-long SvxLineBox::Notify( NotifyEvent& rNEvt )
+bool SvxLineBox::Notify( NotifyEvent& rNEvt )
{
- long nHandled = LineLB::Notify( rNEvt );
+ bool nHandled = LineLB::Notify( rNEvt );
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -198,13 +198,13 @@ long SvxLineBox::Notify( NotifyEvent& rNEvt )
{
case KEY_RETURN:
Select();
- nHandled = 1;
+ nHandled = true;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list