[Libreoffice-commits] core.git: 4 commits - basctl/source cui/source dbaccess/source drawinglayer/source extensions/source forms/source formula/source framework/inc framework/source include/dbaccess include/formula include/svtools include/svx include/vcl reportdesign/source sc/source sd/source sfx2/source svtools/source svx/inc svx/source sw/source vcl/inc vcl/source
Stephan Bergmann
sbergman at redhat.com
Fri Jan 17 15:38:36 PST 2014
basctl/source/basicide/basicbox.cxx | 20 ++--
basctl/source/basicide/basicbox.hxx | 4
cui/source/dialogs/SpellDialog.cxx | 5 -
cui/source/dialogs/colorpicker.cxx | 6 -
cui/source/dialogs/commonlingui.cxx | 2
cui/source/dialogs/commonlingui.hxx | 2
cui/source/dialogs/hangulhanjadlg.cxx | 12 +-
cui/source/dialogs/hltpbase.cxx | 2
cui/source/inc/SpellDialog.hxx | 2
cui/source/inc/autocdlg.hxx | 2
cui/source/inc/hangulhanjadlg.hxx | 2
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/numfmt.hxx | 2
cui/source/options/optcolor.cxx | 6 -
cui/source/tabpages/autocdlg.cxx | 8 -
cui/source/tabpages/numfmt.cxx | 2
dbaccess/source/ui/app/AppView.cxx | 6 -
dbaccess/source/ui/app/AppView.hxx | 2
dbaccess/source/ui/browser/brwview.cxx | 8 -
dbaccess/source/ui/browser/dataview.cxx | 4
dbaccess/source/ui/control/RelationControl.cxx | 4
dbaccess/source/ui/control/TableGrantCtrl.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 2
dbaccess/source/ui/inc/JoinTableView.hxx | 2
dbaccess/source/ui/inc/QueryDesignView.hxx | 2
dbaccess/source/ui/inc/RelationDesignView.hxx | 2
dbaccess/source/ui/inc/SqlNameEdit.hxx | 2
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 2
dbaccess/source/ui/inc/TableDesignView.hxx | 2
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 2
dbaccess/source/ui/inc/TableWindow.hxx | 2
dbaccess/source/ui/inc/TableWindowListBox.hxx | 2
dbaccess/source/ui/inc/WTypeSelect.hxx | 2
dbaccess/source/ui/inc/brwview.hxx | 2
dbaccess/source/ui/inc/querycontainerwindow.hxx | 2
dbaccess/source/ui/misc/WTypeSelect.cxx | 10 +-
dbaccess/source/ui/querydesign/JoinTableView.cxx | 4
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
dbaccess/source/ui/querydesign/TableWindow.cxx | 4
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 4
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 4
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 6 -
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2
dbaccess/source/ui/tabledesign/TEditControl.hxx | 2
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 4
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 4
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 2
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 1
extensions/source/bibliography/bibcont.cxx | 8 -
extensions/source/bibliography/bibcont.hxx | 2
extensions/source/bibliography/toolbar.cxx | 4
extensions/source/bibliography/toolbar.hxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 4
extensions/source/propctrlr/browserlistbox.hxx | 2
extensions/source/propctrlr/commoncontrol.hxx | 6 -
extensions/source/propctrlr/standardcontrol.cxx | 10 +-
extensions/source/propctrlr/standardcontrol.hxx | 6 -
extensions/source/propctrlr/usercontrol.cxx | 4
extensions/source/propctrlr/usercontrol.hxx | 2
forms/source/richtext/richtextvclcontrol.cxx | 6 -
forms/source/richtext/richtextvclcontrol.hxx | 2
formula/source/ui/dlg/ControlHelper.hxx | 2
formula/source/ui/dlg/formula.cxx | 4
formula/source/ui/dlg/funcpage.cxx | 4
formula/source/ui/dlg/funcpage.hxx | 2
formula/source/ui/dlg/funcutl.cxx | 6 -
framework/inc/uielement/comboboxtoolbarcontroller.hxx | 4
framework/inc/uielement/dropdownboxtoolbarcontroller.hxx | 4
framework/inc/uielement/edittoolbarcontroller.hxx | 4
framework/inc/uielement/spinfieldtoolbarcontroller.hxx | 4
framework/source/uielement/comboboxtoolbarcontroller.cxx | 14 +-
framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 12 +-
framework/source/uielement/edittoolbarcontroller.cxx | 14 +-
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 14 +-
include/dbaccess/dataview.hxx | 2
include/formula/formula.hxx | 4
include/svtools/addresstemplate.hxx | 2
include/svtools/editbrowsebox.hxx | 10 +-
include/svtools/editsyntaxhighlighter.hxx | 2
include/svtools/fileurlbox.hxx | 2
include/svtools/fmtfield.hxx | 2
include/svtools/inettbc.hxx | 2
include/svtools/roadmap.hxx | 2
include/svtools/simptabl.hxx | 2
include/svtools/urlcontrol.hxx | 2
include/svx/gridctrl.hxx | 2
include/svx/itemwin.hxx | 10 +-
include/svx/rubydialog.hxx | 2
include/vcl/button.hxx | 6 -
include/vcl/combobox.hxx | 2
include/vcl/field.hxx | 24 ++--
include/vcl/longcurr.hxx | 4
include/vcl/lstbox.hxx | 2
include/vcl/scrbar.hxx | 2
include/vcl/spin.hxx | 2
include/vcl/spinfld.hxx | 2
include/vcl/splitwin.hxx | 2
include/vcl/syswin.hxx | 2
include/vcl/tabctrl.hxx | 2
include/vcl/vclmedit.hxx | 2
include/vcl/window.hxx | 2
reportdesign/source/ui/dlg/AddField.cxx | 4
reportdesign/source/ui/dlg/CondFormat.cxx | 6 -
reportdesign/source/ui/inc/AddField.hxx | 2
reportdesign/source/ui/inc/CondFormat.hxx | 2
reportdesign/source/ui/inc/DesignView.hxx | 2
reportdesign/source/ui/report/DesignView.cxx | 16 +--
sc/source/ui/inc/acredlin.hxx | 2
sc/source/ui/inc/anyrefdg.hxx | 6 -
sc/source/ui/inc/funcpage.hxx | 2
sc/source/ui/inc/gridwin.hxx | 2
sc/source/ui/inc/tphfedit.hxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/view/gridwin.cxx | 16 +--
sd/source/ui/animations/CustomAnimationDialog.cxx | 6 -
sfx2/source/appl/newhelp.cxx | 34 +++----
sfx2/source/appl/newhelp.hxx | 8 -
sfx2/source/control/thumbnailviewitem.cxx | 10 +-
sfx2/source/view/frame2.cxx | 8 -
svtools/source/brwbox/ebbcontrols.cxx | 18 +--
svtools/source/brwbox/editbrowsebox.cxx | 8 -
svtools/source/contnr/imivctl1.cxx | 6 -
svtools/source/contnr/simptabl.cxx | 6 -
svtools/source/contnr/templwin.cxx | 10 +-
svtools/source/contnr/templwin.hxx | 2
svtools/source/control/fileurlbox.cxx | 2
svtools/source/control/fmtfield.cxx | 2
svtools/source/control/inettbc.cxx | 6 -
svtools/source/control/roadmap.cxx | 2
svtools/source/control/tabbar.cxx | 14 +-
svtools/source/control/urlcontrol.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 6 -
svtools/source/edit/editsyntaxhighlighter.cxx | 2
svtools/source/hatchwindow/ipwin.cxx | 2
svtools/source/hatchwindow/ipwin.hxx | 2
svx/inc/tbunosearchcontrollers.hxx | 2
svx/source/dialog/rubydialog.cxx | 6 -
svx/source/fmcomp/gridctrl.cxx | 8 -
svx/source/form/tabwin.cxx | 4
svx/source/gallery2/galbrws1.cxx | 6 -
svx/source/gallery2/galbrws1.hxx | 2
svx/source/inc/tabwin.hxx | 2
svx/source/sidebar/text/SvxSBFontNameBox.cxx | 2
svx/source/sidebar/text/SvxSBFontNameBox.hxx | 2
svx/source/tbxctrls/grafctrl.cxx | 4
svx/source/tbxctrls/itemwin.cxx | 10 +-
svx/source/tbxctrls/tbcontrl.cxx | 8 -
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 8 -
sw/source/ui/dbui/createaddresslistdialog.cxx | 6 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 14 +-
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/fldui/fldvar.cxx | 4
sw/source/ui/fldui/fldvar.hxx | 2
sw/source/ui/frmdlg/cption.cxx | 6 -
sw/source/ui/inc/bookmark.hxx | 2
sw/source/ui/inc/cption.hxx | 2
sw/source/ui/misc/bookmark.cxx | 6 -
vcl/inc/ilstbox.hxx | 4
vcl/inc/svdata.hxx | 3
vcl/source/app/dbggui.cxx | 6 -
vcl/source/control/button.cxx | 18 +--
vcl/source/control/combobox.cxx | 2
vcl/source/control/field.cxx | 24 ++--
vcl/source/control/field2.cxx | 24 ++--
vcl/source/control/ilstbox.cxx | 8 -
vcl/source/control/longcurr.cxx | 8 -
vcl/source/control/lstbox.cxx | 14 +-
vcl/source/control/scrbar.cxx | 6 -
vcl/source/control/spinbtn.cxx | 6 -
vcl/source/control/spinfld.cxx | 6 -
vcl/source/control/tabctrl.cxx | 6 -
vcl/source/edit/vclmedit.cxx | 10 +-
vcl/source/window/splitwin.cxx | 2
vcl/source/window/syswin.cxx | 6 -
vcl/source/window/window.cxx | 4
vcl/source/window/winproc.cxx | 58 +-----------
180 files changed, 466 insertions(+), 513 deletions(-)
New commits:
commit 602c87b4259d118e5db6d8a990c4695103f916dd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Jan 18 00:18:52 2014 +0100
Window::PreNotify should return bool
Change-Id: Ic9903fd887f2c3fab2630ebeb20df39392177c8d
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index db86fdf..2ccad9b 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -254,9 +254,9 @@ void LibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLo
}
}
-long LibBox::PreNotify( NotifyEvent& rNEvt )
+bool LibBox::PreNotify( NotifyEvent& rNEvt )
{
- long nDone = 0;
+ bool nDone = false;
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
@@ -266,7 +266,7 @@ long LibBox::PreNotify( NotifyEvent& rNEvt )
case KEY_RETURN:
{
NotifyIDE();
- nDone = 1;
+ nDone = true;
}
break;
@@ -274,7 +274,7 @@ long LibBox::PreNotify( NotifyEvent& rNEvt )
{
SelectEntry( aCurText );
ReleaseFocus();
- nDone = 1;
+ nDone = true;
}
break;
}
@@ -296,7 +296,7 @@ long LibBox::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone ? nDone : ListBox::PreNotify( rNEvt );
+ return nDone || ListBox::PreNotify( rNEvt );
}
void LibBox::Select()
@@ -473,9 +473,9 @@ void LanguageBox::Select()
SelectEntry( m_sCurrentText ); // Select after Escape
}
-long LanguageBox::PreNotify( NotifyEvent& rNEvt )
+bool LanguageBox::PreNotify( NotifyEvent& rNEvt )
{
- long nDone = 0;
+ bool nDone = false;
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
sal_uInt16 nKeyCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
@@ -484,14 +484,14 @@ long LanguageBox::PreNotify( NotifyEvent& rNEvt )
case KEY_RETURN:
{
SetLanguage();
- nDone = 1;
+ nDone = true;
}
break;
case KEY_ESCAPE:
{
SelectEntry( m_sCurrentText );
- nDone = 1;
+ nDone = true;
}
break;
}
@@ -503,7 +503,7 @@ long LanguageBox::PreNotify( NotifyEvent& rNEvt )
{
}
- return nDone ? nDone : ListBox::PreNotify( rNEvt );
+ return nDone || ListBox::PreNotify( rNEvt );
}
void LanguageBox::Update( const SfxStringItem* pItem )
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index 54f476d..b3a8501 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -92,7 +92,7 @@ private:
protected:
virtual void Select();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
LibBox( Window* pParent,
@@ -132,7 +132,7 @@ private:
protected:
virtual void Select();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
LanguageBox( Window* pParent );
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 034ada9..97829c7 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1274,7 +1274,7 @@ SentenceEditWindow_Impl::~SentenceEditWindow_Impl()
#define ACTION_SELECTFIELD 2
#define ACTION_EXPAND 3
-long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
+bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
{
bool bChange = false;
const TextCharAttrib* pErrorAttrib = 0;
@@ -1538,8 +1538,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
else
bChange = false;
}
- long nRet = bChange ? 1 : MultiLineEdit::PreNotify(rNEvt);
- return nRet;
+ return bChange || MultiLineEdit::PreNotify(rNEvt);
}
//-----------------------------------------------------------------------
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 34849a0..e0ca149 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -140,7 +140,7 @@ class HexColorControl : public Edit
public:
HexColorControl( Window* pParent, const ResId& rResId );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void Paste();
void SetColor( sal_Int32 nColor );
@@ -192,12 +192,12 @@ sal_Int32 HexColorControl::GetColor()
// -----------------------------------------------------------------------
-long HexColorControl::PreNotify( NotifyEvent& rNEvt )
+bool HexColorControl::PreNotify( NotifyEvent& rNEvt )
{
if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplProcessKeyInput( *rNEvt.GetKeyEvent() ) )
- return 1;
+ return true;
}
return Edit::PreNotify( rNEvt );
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index d94a074..012895d 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -46,7 +46,7 @@ void SvxClickInfoCtr::MouseButtonDown( const MouseEvent& )
}
//-----------------------------------------------------------------------------
-long SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt )
+bool SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt )
{
if(rNEvt.GetType()==EVENT_GETFOCUS || rNEvt.GetType()==EVENT_MOUSEBUTTONDOWN)
{
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 5f53283..1795f01 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -49,7 +49,7 @@ public:
protected:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
};
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index dd244e0..2dfba19 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1388,9 +1388,9 @@ namespace svx
{
}
- long SuggestionEdit::PreNotify( NotifyEvent& rNEvt )
+ bool SuggestionEdit::PreNotify( NotifyEvent& rNEvt )
{
- long nHandled = 0;
+ bool nHandled = false;
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -1405,7 +1405,7 @@ namespace svx
DoJump( bUp );
SetSelection( Selection( 0, SELECTION_MAX ) );
// Tab-travel doesn't really happen, so emulate it by setting a selection manually
- nHandled = 1;
+ nHandled = true;
}
}
else if( KEY_UP == nCode || KEY_DOWN == nCode )
@@ -1414,20 +1414,20 @@ namespace svx
if( ShouldScroll( bUp ) )
{
DoJump( bUp );
- nHandled = 1;
+ nHandled = true;
}
else if( bUp )
{
if( m_pPrev )
{
m_pPrev->GrabFocus();
- nHandled = 1;
+ nHandled = true;
}
}
else if( m_pNext )
{
m_pNext->GrabFocus();
- nHandled = 1;
+ nHandled = true;
}
}
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 331a9ea..29774dd 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -108,7 +108,7 @@ bool SvxHyperURLBox::Notify( NotifyEvent& rNEvt )
{
return SvtURLBox::Notify( rNEvt );
}
-long SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt )
+bool SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt )
{
return SvtURLBox::PreNotify( rNEvt );
}
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 3cfe2ff..5f88f3b 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -72,7 +72,7 @@ private:
SpellDialog* GetSpellDialog() const {return (SpellDialog*)GetParentDialog();}
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
SentenceEditWindow_Impl(Window* pParent, WinBits nBits);
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index faf5af0..58f7851 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -407,7 +407,7 @@ class OfaAutoCompleteTabPage : public SfxTabPage
const ResId& rResId )
: MultiListBox( &rPg, rResId ), rPage( rPg ) {}
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
};
CheckBox aCBActiv; ///<Enable word completion
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 4536197..8bde65e 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -264,7 +264,7 @@ namespace svx
ScrollBar& _rScrollBar,
SuggestionEdit* _pPrev, SuggestionEdit* _pNext );
virtual ~SuggestionEdit();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
};
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 874b293..847a079 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -64,7 +64,7 @@ protected:
virtual bool Notify( NotifyEvent& rNEvt );
virtual void Select();
virtual void Modify();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE );
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 40b065f..33f4381 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -84,7 +84,7 @@ public:
void SetOkHdl( const Link& rOkHandler );
void HideLanguage(sal_Bool nFlag=sal_True);
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void PageCreated (SfxAllItemSet aSet);
private:
SvxNumberFormatTabPage( Window* pParent,
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 20160e6..846e5e9 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -837,7 +837,7 @@ class ColorConfigCtrl_Impl : public VclVBox
DECL_LINK(ColorHdl, ColorListBox*);
DECL_LINK(ControlFocusHdl, Control*);
- virtual long PreNotify (NotifyEvent& rNEvt);
+ virtual bool PreNotify (NotifyEvent& rNEvt);
virtual void Command (CommandEvent const& rCEvt);
virtual void DataChanged (DataChangedEvent const& rDCEvt);
public:
@@ -934,7 +934,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar)
return 0;
}
-long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt )
+bool ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt )
{
if(rNEvt.GetType() == EVENT_COMMAND)
{
@@ -943,7 +943,7 @@ long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt )
if( COMMAND_WHEEL == nCmd )
{
Command(*pCEvt);
- return 1;
+ return true;
}
}
return VclVBox::PreNotify(rNEvt);
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index c4e7f9e..0fb4c17 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2286,10 +2286,10 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
}
}
-long OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
+bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
NotifyEvent& rNEvt )
{
- long nHandled = MultiListBox::PreNotify( rNEvt );
+ bool nHandled = MultiListBox::PreNotify( rNEvt );
if( !nHandled && EVENT_KEYUP == rNEvt.GetType() )
{
@@ -2298,14 +2298,14 @@ long OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
{
case KEY_DELETE:
rPage.DeleteHdl( 0 );
- nHandled = 1;
+ nHandled = true;
break;
default:
if( KEYFUNC_COPY == rKeyCode.GetFunction() )
{
rPage.CopyToClipboard();
- nHandled = 1;
+ nHandled = true;
}
break;
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 3212d48..8fdc964 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1639,7 +1639,7 @@ void SvxNumberFormatTabPage::ChangePreviewText( sal_uInt16 nPos )
m_pWndPreview->NotifyChange( aPreviewString, pPreviewColor );
}
-long SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
+bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
{
if(rNEvt.GetType()==EVENT_LOSEFOCUS)
{
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index f9dac6a..6083b2e 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -274,7 +274,7 @@ void OApplicationView::resizeDocumentView(Rectangle& _rPlayground)
_rPlayground.SetSize( Size( 0, 0 ) );
}
-long OApplicationView::PreNotify( NotifyEvent& rNEvt )
+bool OApplicationView::PreNotify( NotifyEvent& rNEvt )
{
switch(rNEvt.GetType())
{
@@ -292,11 +292,11 @@ long OApplicationView::PreNotify( NotifyEvent& rNEvt )
// give the pane the chance to intercept mnemonic accelerators
// #i34790#
if ( getPanel() && getPanel()->interceptKeyInput( *pKeyEvent ) )
- return 1L;
+ return true;
// and ditto the detail view
// #i72799#
if ( getDetailView() && getDetailView()->interceptKeyInput( *pKeyEvent ) )
- return 1L;
+ return true;
}
break;
}
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 0e4b48d..70569f5 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -111,7 +111,7 @@ namespace dbaui
void setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics );
// window overloads
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
inline IApplicationController& getAppController() const { return m_rAppController; }
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 488142c..d7a2d0c 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -304,9 +304,9 @@ void UnoDataBrowserView::_disposing( const ::com::sun::star::lang::EventObject&
m_pVclControl = NULL;
}
-long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
+bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
{
- long nDone = 0L;
+ bool nDone = false;
if(rNEvt.GetType() == EVENT_KEYINPUT)
{
sal_Bool bGrabAllowed = isGrabVclControlFocusAllowed(this);
@@ -323,11 +323,11 @@ long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
else if ( m_pTreeView && m_pVclControl && m_pVclControl->HasChildPathFocus() )
m_pTreeView->GrabFocus();
- nDone = 1L;
+ nDone = true;
}
}
}
- return nDone ? nDone : ODataView::PreNotify(rNEvt);
+ return nDone || ODataView::PreNotify(rNEvt);
}
DBG_NAME(BrowserViewStatusDisplay)
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 45340ec..7426382 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -119,7 +119,7 @@ namespace dbaui
Window::Resize();
resizeAll( Rectangle( Point( 0, 0), GetSizePixel() ) );
}
- long ODataView::PreNotify( NotifyEvent& _rNEvt )
+ bool ODataView::PreNotify( NotifyEvent& _rNEvt )
{
bool bHandled = false;
switch ( _rNEvt.GetType() )
@@ -139,7 +139,7 @@ namespace dbaui
bHandled = m_rController.interceptUserInput( _rNEvt );
break;
}
- return bHandled ? 1L : Window::PreNotify( _rNEvt );
+ return bHandled || Window::PreNotify( _rNEvt );
}
void ODataView::StateChanged( StateChangedType nType )
{
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index c10f70f..26e6587 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -100,7 +100,7 @@ namespace dbaui
protected:
virtual void Resize();
- virtual long PreNotify(NotifyEvent& rNEvt );
+ virtual bool PreNotify(NotifyEvent& rNEvt );
virtual sal_Bool IsTabAllowed(sal_Bool bForward) const;
@@ -186,7 +186,7 @@ namespace dbaui
SetColumnWidth(2, (nOutputWidth / 2));
}
- long ORelationControl::PreNotify(NotifyEvent& rNEvt)
+ bool ORelationControl::PreNotify(NotifyEvent& rNEvt)
{
DBG_CHKTHIS(ORelationControl,NULL);
if (rNEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 27f3d7f..5286ead 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -148,7 +148,7 @@ void OTableGrantControl::Resize()
EditBrowseBox::Resize();
}
-long OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
+bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
{
DBG_CHKTHIS(OTableGrantControl,NULL);
if (rNEvt.GetType() == EVENT_LOSEFOCUS)
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 351c345..1936193 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -550,7 +550,7 @@ DBG_NAME(OConnectionHelper)
}
return eExists;
}
- long OConnectionHelper::PreNotify( NotifyEvent& _rNEvt )
+ bool OConnectionHelper::PreNotify( NotifyEvent& _rNEvt )
{
if ( m_pCollection->isFileSystemBased(m_eType) )
{
@@ -567,7 +567,7 @@ DBG_NAME(OConnectionHelper)
if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus)
{ // a descendant of the URL edit field lost the focus
if (!commitURL())
- return 1L; // handled
+ return true; // handled
}
break;
}
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 5d6f5e2..b770d46 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -53,7 +53,7 @@ namespace dbaui
// setting/retrieving the current connection URL
// necessary because for some types, the URL must be decoded for display purposes
::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance
- virtual long PreNotify( NotifyEvent& _rNEvt );
+ virtual bool PreNotify( NotifyEvent& _rNEvt );
// <method>OGenericAdministrationPage::fillControls</method>
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index e8da81c..8d3a82f 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -223,7 +223,7 @@ namespace dbaui
/** @note used by AddTabDlg to see if more tables can be added */
virtual sal_Bool IsAddAllowed();
- virtual long PreNotify(NotifyEvent& rNEvt);
+ virtual bool PreNotify(NotifyEvent& rNEvt);
// DnD stuff
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index e006fe8de..e4341a0 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -97,7 +97,7 @@ namespace dbaui
virtual void Construct();
virtual void initialize();
// window overloads
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
sal_Bool isSlotEnabled(sal_Int32 _nSlotId);
diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx
index a9ad677..5371d3c5 100644
--- a/dbaccess/source/ui/inc/RelationDesignView.hxx
+++ b/dbaccess/source/ui/inc/RelationDesignView.hxx
@@ -41,7 +41,7 @@ namespace dbaui
virtual void initialize();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
};
}
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx
index 635842b..d192fde 100644
--- a/dbaccess/source/ui/inc/SqlNameEdit.hxx
+++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx
@@ -68,7 +68,7 @@ namespace dbaui
}
// Window overload
- // virtual long PreNotify( NotifyEvent& rNEvt );
+ // virtual bool PreNotify( NotifyEvent& rNEvt );
// Edit
virtual void Modify();
};
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index a54d2dd..f691de9 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -45,7 +45,7 @@ namespace dbaui
void SetHelpText( const OUString& rText );
OUString GetHelpText() const { return m_sHelpText; }
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
// IClipboardTest
virtual sal_Bool isCutAllowed();
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index bd98b67..c3dc7a9 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -79,7 +79,7 @@ namespace dbaui
virtual ~OTableDesignView();
// window overloads
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; }
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index ccf4a77..6e360cb 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -82,7 +82,7 @@ public:
protected:
virtual void Resize();
- virtual long PreNotify(NotifyEvent& rNEvt );
+ virtual bool PreNotify(NotifyEvent& rNEvt );
virtual sal_Bool IsTabAllowed(sal_Bool bForward) const;
virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol );
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index d822cf9..855d5a6 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -176,7 +176,7 @@ namespace dbaui
// window override
virtual void StateChanged( StateChangedType nStateChange );
virtual void GetFocus();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void Command(const CommandEvent& rEvt);
// Accessibility
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index a4425e3..8d0cf2f 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -69,7 +69,7 @@ namespace dbaui
virtual void NotifyScrolled();
virtual void NotifyEndScroll();
- virtual long PreNotify(NotifyEvent& rNEvt);
+ virtual bool PreNotify(NotifyEvent& rNEvt);
virtual void dragFinished( );
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index d4aaf98..b7f66d0 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -67,7 +67,7 @@ namespace dbaui
sal_uInt16 _nPos,
sal_Bool _bSet=sal_False);
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) {};
OWizTypeSelectList( Window* pParent, const ResId& rResId ) : MultiListBox(pParent,rResId) {};
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index b0f54cb..801dca5 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -81,7 +81,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getContainer() { return m_xMe; }
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
virtual void resizeDocumentView(Rectangle& rRect);
virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource );
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 45f5fee..fdc57d4 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -53,7 +53,7 @@ namespace dbaui
virtual void Construct();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
// show the beamer
void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame);
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index af4fca0..b1c3c97 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -387,16 +387,16 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr,sal_uInt1
SetEntryData(_nPos,_pFieldDescr);
}
-long OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
+bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
{
- long nDone = 0;
+ bool nDone = false;
switch( rEvt.GetType() )
{
case EVENT_MOUSEBUTTONDOWN:
{
const MouseEvent* pMEvt = rEvt.GetMouseEvent();
if(pMEvt->IsRight() && !pMEvt->GetModifier())
- nDone = 1;
+ nDone = true;
}
break;
case EVENT_COMMAND:
@@ -436,11 +436,11 @@ long OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
}
break;
}
- nDone = 1;
+ nDone = true;
}
break;
}
- return nDone ? nDone : MultiListBox::PreNotify(rEvt);
+ return nDone || MultiListBox::PreNotify(rEvt);
}
void OWizTypeSelect::fillColumnList(sal_uInt32 nRows)
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 0d412d3..0d804f5 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1269,7 +1269,7 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab
return pConn;
}
-long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
+bool OJoinTableView::PreNotify(NotifyEvent& rNEvt)
{
sal_Bool bHandled = sal_False;
switch (rNEvt.GetType())
@@ -1460,7 +1460,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
if (!bHandled)
return Window::PreNotify(rNEvt);
- return 1L;
+ return true;
}
void OJoinTableView::GrabTabWinFocus()
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index fad78e1..80d6b1f 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2778,7 +2778,7 @@ void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFi
}
}
-long OQueryDesignView::PreNotify(NotifyEvent& rNEvt)
+bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt)
{
switch (rNEvt.GetType())
{
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 6b734e8..beedbae 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -607,7 +607,7 @@ void OTableWindow::Command(const CommandEvent& rEvt)
}
}
-long OTableWindow::PreNotify(NotifyEvent& rNEvt)
+bool OTableWindow::PreNotify(NotifyEvent& rNEvt)
{
sal_Bool bHandled = sal_False;
switch (rNEvt.GetType())
@@ -737,7 +737,7 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt)
}
if (!bHandled)
return Window::PreNotify(rNEvt);
- return 1L;
+ return true;
}
OUString OTableWindow::getTitle() const
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 9c58785..746947d 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -130,7 +130,7 @@ void OTableWindowListBox::NotifyEndScroll()
m_bReallyScrolled = sal_False;
}
-long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
+bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
{
sal_Bool bHandled = sal_False;
switch (rNEvt.GetType())
@@ -159,7 +159,7 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
if (!bHandled)
return SvTreeListBox::PreNotify(rNEvt);
- return 1L;
+ return true;
}
IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 8cc0b6e..79abb14 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -156,7 +156,7 @@ namespace dbaui
Resize();
}
}
- long OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt )
+ bool OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt )
{
sal_Bool bHandled = sal_False;
switch (rNEvt.GetType())
@@ -170,7 +170,7 @@ namespace dbaui
rController.InvalidateFeature(SID_PASTE);
}
}
- return bHandled ? 1L : ODataView::PreNotify(rNEvt);
+ return bHandled || ODataView::PreNotify(rNEvt);
}
void OQueryContainerWindow::showPreview(const Reference<XFrame>& _xFrame)
{
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 9f72313..b97fe50 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -71,15 +71,15 @@ void ORelationDesignView::initialize()
OJoinDesignView::initialize();
}
-long ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
+bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
{
- long nDone = 0L;
+ bool nDone = false;
if(rNEvt.GetType() == EVENT_GETFOCUS)
{
if(!m_pTableView->HasChildPathFocus())
{
m_pTableView->GrabTabWinFocus();
- nDone = 1L;
+ nDone = true;
}
}
if(!nDone)
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 820ba0f..664d4c9d 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1745,7 +1745,7 @@ void OTableEditorCtrl::DeactivateCell(sal_Bool bUpdate)
pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly());
}
-long OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt )
+bool OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt )
{
if (rNEvt.GetType() == EVENT_GETFOCUS)
{
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 34d6966..02c4c1d 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -165,7 +165,7 @@ namespace dbaui
OFieldDescription* GetFieldDescr( long nRow );
// window overloads
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
// IClipboardTest
virtual sal_Bool isCutAllowed() { return IsCutAllowed(); }
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index ebc9f39..e2681b0 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -66,7 +66,7 @@ void OTableDesignHelpBar::Resize()
}
-long OTableDesignHelpBar::PreNotify( NotifyEvent& rNEvt )
+bool OTableDesignHelpBar::PreNotify( NotifyEvent& rNEvt )
{
if (rNEvt.GetType() == EVENT_LOSEFOCUS)
SetHelpText(OUString());
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 29c8c55..c459c76 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -229,7 +229,7 @@ void OTableDesignView::resizeDocumentView(Rectangle& _rPlayground)
_rPlayground.SetSize( Size( 0, 0 ) );
}
-long OTableDesignView::PreNotify( NotifyEvent& rNEvt )
+bool OTableDesignView::PreNotify( NotifyEvent& rNEvt )
{
sal_Bool bHandled = sal_False;
switch(rNEvt.GetType())
@@ -244,7 +244,7 @@ long OTableDesignView::PreNotify( NotifyEvent& rNEvt )
break;
}
- return bHandled ? 1L : ODataView::PreNotify(rNEvt);
+ return bHandled || ODataView::PreNotify(rNEvt);
}
IClipboardTest* OTableDesignView::getActiveChild() const
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index e3b9bfb..fd66336 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -276,7 +276,7 @@ void OTableFieldDescWin::LoseFocus()
getGenPage()->LoseFocus();
}
-long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
+bool OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
{
sal_Bool bHandled = sal_False;
switch(rNEvt.GetType())
@@ -289,7 +289,7 @@ long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
break;
}
- return bHandled ? 1L : TabPage::PreNotify(rNEvt);
+ return bHandled || TabPage::PreNotify(rNEvt);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 94223ea..8f5eca5 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -63,7 +63,7 @@ namespace dbaui
void SetReadOnly( sal_Bool bReadOnly );
// window overloads
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
virtual void LoseFocus();
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 123c146..21be478 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -210,9 +210,9 @@ void BibBookContainer::GetFocus()
pBottomWin->GrabFocus();
}
-long BibBookContainer::PreNotify( NotifyEvent& rNEvt )
+bool BibBookContainer::PreNotify( NotifyEvent& rNEvt )
{
- long nHandled = 0;
+ bool nHandled = false;
if( EVENT_KEYINPUT == rNEvt.GetType() )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -235,10 +235,10 @@ long BibBookContainer::PreNotify( NotifyEvent& rNEvt )
SetItemSize( nFirstWinId, nHeight );
SetItemSize( nSecondWinId, 100 - nHeight );
}
- nHandled = 1;
+ nHandled = true;
}
else if( pKEvt->GetCharCode() && HandleShortCutKey( *pKEvt ) )
- nHandled = 1;
+ nHandled = true;
}
}
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index cb5bbee..f63fef0 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -79,7 +79,7 @@ class BibBookContainer: public BibSplitWindow
virtual void Split();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 9b5139c..06cf392 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -428,9 +428,9 @@ void BibToolBar::SetQueryString(const OUString& aStr)
}
-long BibToolBar::PreNotify( NotifyEvent& rNEvt )
+bool BibToolBar::PreNotify( NotifyEvent& rNEvt )
{
- long nResult=sal_True;
+ bool nResult = true;
sal_uInt16 nSwitch=rNEvt.GetType();
if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT)
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 58229c7..c80b689 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -143,7 +143,7 @@ class BibToolBar: public ToolBox
void InitListener();
virtual void Select();
virtual void Click();
- long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 1333185..ac52c6a 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1207,7 +1207,7 @@ namespace pcr
}
//------------------------------------------------------------------
- long OBrowserListBox::PreNotify( NotifyEvent& _rNEvt )
+ bool OBrowserListBox::PreNotify( NotifyEvent& _rNEvt )
{
switch ( _rNEvt.GetType() )
{
@@ -1255,7 +1255,7 @@ namespace pcr
}
}
- return 1L;
+ return true;
// handled this. In particular, we also consume PageUp/Down events if we do not use them for scrolling,
// otherwise they would be used to scroll the document view, which does not sound like it is desired by
// the user.
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 2001034d..6b1da47 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -134,7 +134,7 @@ namespace pcr
void EnableUpdate();
void DisableUpdate();
bool Notify( NotifyEvent& _rNEvt );
- long PreNotify( NotifyEvent& _rNEvt );
+ virtual bool PreNotify( NotifyEvent& _rNEvt );
void SetListener( IPropertyLineListener* _pListener );
void SetObserver( IPropertyControlObserver* _pObserver );
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index f8aaa35..fe1405a 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -58,7 +58,7 @@ namespace pcr
protected:
// Window overridables
- inline virtual long PreNotify( NotifyEvent& rNEvt );
+ inline virtual bool PreNotify( NotifyEvent& rNEvt );
};
//========================================================================
@@ -231,10 +231,10 @@ namespace pcr
//------------------------------------------------------------------------
template< class WINDOW >
- inline long ControlWindow< WINDOW >::PreNotify( NotifyEvent& rNEvt )
+ inline bool ControlWindow< WINDOW >::PreNotify( NotifyEvent& rNEvt )
{
if ( m_pHelper && m_pHelper->handlePreNotify( rNEvt ) )
- return 1;
+ return true;
return WindowType::PreNotify( rNEvt );
}
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index ced964c..fe471ac 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -971,7 +971,7 @@ namespace pcr
MultiLineEdit* getEdit() { return &m_aImplEdit; }
protected:
- virtual long PreNotify(NotifyEvent& _rNEvt);
+ virtual bool PreNotify(NotifyEvent& _rNEvt);
};
//------------------------------------------------------------------
@@ -989,9 +989,9 @@ namespace pcr
}
//------------------------------------------------------------------
- long OMultilineFloatingEdit::PreNotify(NotifyEvent& _rNEvt)
+ bool OMultilineFloatingEdit::PreNotify(NotifyEvent& _rNEvt)
{
- long nResult = sal_True;
+ bool nResult = true;
sal_uInt16 nSwitch = _rNEvt.GetType();
if (EVENT_KEYINPUT == nSwitch)
@@ -1095,9 +1095,9 @@ namespace pcr
}
//------------------------------------------------------------------
- long DropDownEditControl::PreNotify( NotifyEvent& rNEvt )
+ bool DropDownEditControl::PreNotify( NotifyEvent& rNEvt )
{
- long nResult = 1;
+ bool nResult = true;
if (rNEvt.GetType() == EVENT_KEYINPUT)
{
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index b7cd14e..5d8f627 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -66,12 +66,12 @@ namespace pcr
void SetModifyHdl( const Link& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); }
protected:
- long PreNotify( NotifyEvent& _rNEvt );
+ bool PreNotify( NotifyEvent& _rNEvt );
};
//------------------------------------------------------------------------
template< class LISTBOX_WINDOW >
- long ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::PreNotify( NotifyEvent& _rNEvt )
+ bool ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::PreNotify( NotifyEvent& _rNEvt )
{
if ( _rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -399,7 +399,7 @@ namespace pcr
protected:
// Window overridables
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void Resize();
protected:
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 9433c6d..833dd60 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -45,7 +45,7 @@ namespace pcr
// NumberFormatSampleField
//==================================================================
//------------------------------------------------------------------
- long NumberFormatSampleField::PreNotify( NotifyEvent& rNEvt )
+ bool NumberFormatSampleField::PreNotify( NotifyEvent& rNEvt )
{
// want to handle two keys myself : Del/Backspace should empty the window (setting my prop to "standard" this way)
if (EVENT_KEYINPUT == rNEvt.GetType())
@@ -57,7 +57,7 @@ namespace pcr
SetText( "" );
if ( m_pHelper )
m_pHelper->ModifiedHdl( this );
- return 1;
+ return true;
}
}
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index c860b77..e870711 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -49,7 +49,7 @@ namespace pcr
void SetFormatSupplier( const SvNumberFormatsSupplierObj* pSupplier );
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
};
//========================================================================
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index a145f62..67a4f7c 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -194,7 +194,7 @@ namespace frm
}
//--------------------------------------------------------------------
- long RichTextControl::PreNotify( NotifyEvent& _rNEvt )
+ bool RichTextControl::PreNotify( NotifyEvent& _rNEvt )
{
if ( IsWindowOrChild( _rNEvt.GetWindow() ) )
{
@@ -213,7 +213,7 @@ namespace frm
KeyCode aNewCode( KEY_TAB, bShift, sal_False, sal_False, sal_False );
::KeyEvent aNewEvent( pKeyEvent->GetCharCode(), aNewCode );
Control::KeyInput( aNewEvent );
- return 1; // handled
+ return true; // handled
}
#if OSL_DEBUG_LEVEL > 0
@@ -278,7 +278,7 @@ namespace frm
}
DELETEZ( pStream );
}
- return 1; // handled
+ return true; // handled
}
#endif
}
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index 35b5991..e603af8 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -109,7 +109,7 @@ namespace frm
virtual void Resize();
virtual void GetFocus();
virtual void StateChanged( StateChangedType nStateChange );
- virtual long PreNotify( NotifyEvent& _rNEvt );
+ virtual bool PreNotify( NotifyEvent& _rNEvt );
virtual bool Notify( NotifyEvent& _rNEvt );
private:
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 86f4f1d..fe62907 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -55,7 +55,7 @@ private:
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void SelectionChanged();
virtual void Resize();
virtual void GetFocus();
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 4e2ba70..2bfd9b3 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1707,7 +1707,7 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId)
}
}
-long FormulaModalDialog::PreNotify( NotifyEvent& rNEvt )
+bool FormulaModalDialog::PreNotify( NotifyEvent& rNEvt )
{
m_pImpl->PreNotify( rNEvt );
@@ -1820,7 +1820,7 @@ void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId)
}
-long FormulaDlg::PreNotify( NotifyEvent& rNEvt )
+bool FormulaDlg::PreNotify( NotifyEvent& rNEvt )
{
m_pImpl->PreNotify( rNEvt );
return SfxModelessDialog::PreNotify(rNEvt);
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index ef38e18..eef8596 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -43,11 +43,11 @@ void FormulaListBox::KeyInput( const KeyEvent& rKEvt )
DoubleClick();
}
-long FormulaListBox::PreNotify( NotifyEvent& rNEvt )
+bool FormulaListBox::PreNotify( NotifyEvent& rNEvt )
{
NotifyEvent aNotifyEvt=rNEvt;
- long nResult=ListBox::PreNotify(rNEvt);
+ bool nResult = ListBox::PreNotify(rNEvt);
sal_uInt16 nSwitch=aNotifyEvt.GetType();
if(nSwitch==EVENT_KEYINPUT)
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 056c4a5..eb2985b 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -47,7 +47,7 @@ class FormulaListBox : public ListBox
protected:
virtual void KeyInput( const KeyEvent& rKEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
FormulaListBox( Window* pParent, const ResId& rResId );
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 06ef245..895fa67 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -428,9 +428,9 @@ void EditBox::GetFocus()
//When an Event is cleared, this Routine is
//first called and a PostUserEvent is sent.
-long EditBox::PreNotify( NotifyEvent& rNEvt )
+bool EditBox::PreNotify( NotifyEvent& rNEvt )
{
- long nResult=sal_True;
+ bool nResult = true;
if(pMEdit==NULL) return nResult;
@@ -441,7 +441,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
sal_uInt16 nKey=aKeyCode.GetCode();
if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB )
{
- nResult=long(GetParent()->Notify(rNEvt));
+ nResult = GetParent()->Notify(rNEvt);
}
else
{
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index cd577f8..ea3a2ac 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -42,7 +42,7 @@ class IComboBoxListener
virtual void KeyInput( const KeyEvent& rKEvt ) = 0;
virtual void GetFocus() = 0;
virtual void LoseFocus() = 0;
- virtual long PreNotify( NotifyEvent& rNEvt ) = 0;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) = 0;
protected:
~IComboBoxListener() {}
@@ -71,7 +71,7 @@ class ComboboxToolbarController : public IComboBoxListener,
virtual void KeyInput( const KeyEvent& rKEvt );
virtual void GetFocus();
virtual void LoseFocus();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
protected:
virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index da4472c..a6c6ab8 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -41,7 +41,7 @@ class IListBoxListener
virtual void DoubleClick() = 0;
virtual void GetFocus() = 0;
virtual void LoseFocus() = 0;
- virtual long PreNotify( NotifyEvent& rNEvt ) = 0;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) = 0;
protected:
~IListBoxListener() {}
};
@@ -67,7 +67,7 @@ class DropdownToolbarController : public IListBoxListener,
virtual void DoubleClick();
virtual void GetFocus();
virtual void LoseFocus();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
protected:
virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 5e43474d..3630504 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -41,7 +41,7 @@ class IEditListener
virtual void KeyInput( const KeyEvent& rKEvt ) = 0;
virtual void GetFocus() = 0;
virtual void LoseFocus() = 0;
- virtual long PreNotify( NotifyEvent& rNEvt ) = 0;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) = 0;
protected:
~IEditListener() {}
@@ -68,7 +68,7 @@ class EditToolbarController : public IEditListener,
virtual void KeyInput( const KeyEvent& rKEvt );
virtual void GetFocus();
virtual void LoseFocus();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
protected:
virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index 7312ac2..4755c0c 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -47,7 +47,7 @@ class ISpinfieldListener
virtual void LoseFocus() = 0;
virtual void StateChanged( StateChangedType nType ) = 0;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) = 0;
- virtual long PreNotify( NotifyEvent& rNEvt ) = 0;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) = 0;
protected:
~ISpinfieldListener() {}
@@ -80,7 +80,7 @@ class SpinfieldToolbarController : public ISpinfieldListener,
virtual void LoseFocus();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
protected:
virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 6310d92..755da46 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -65,7 +65,7 @@ class ComboBoxControl : public ComboBox
virtual void KeyInput( const ::KeyEvent& rKEvt );
virtual void GetFocus();
virtual void LoseFocus();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
private:
IComboBoxListener* m_pComboBoxListener;
@@ -124,12 +124,12 @@ void ComboBoxControl::LoseFocus()
m_pComboBoxListener->LoseFocus();
}
-long ComboBoxControl::PreNotify( NotifyEvent& rNEvt )
+bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt )
{
- long nRet( 0 );
+ bool nRet = false;
if ( m_pComboBoxListener )
nRet = m_pComboBoxListener->PreNotify( rNEvt );
- if ( nRet == 0 )
+ if ( !nRet )
nRet = ComboBox::PreNotify( rNEvt );
return nRet;
@@ -230,7 +230,7 @@ void ComboboxToolbarController::LoseFocus()
notifyFocusLost();
}
-long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt )
+bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt )
{
switch ( rNEvt.GetType() )
{
@@ -243,7 +243,7 @@ long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt )
// Call execute only with non-empty text
if ( !m_pComboBox->GetText().isEmpty() )
execute( rKeyCode.GetModifier() );
- return 1;
+ return true;
}
}
break;
@@ -256,7 +256,7 @@ long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt )
default :
break;
}
- return 0;
+ return false;
}
// --------------------------------------------------------
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 2bca097..190428d 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -62,7 +62,7 @@ class ListBoxControl : public ListBox
virtual void DoubleClick();
virtual void GetFocus();
virtual void LoseFocus();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
private:
IListBoxListener* m_pListBoxListener;
@@ -107,12 +107,12 @@ void ListBoxControl::LoseFocus()
m_pListBoxListener->LoseFocus();
}
-long ListBoxControl::PreNotify( NotifyEvent& rNEvt )
+bool ListBoxControl::PreNotify( NotifyEvent& rNEvt )
{
- long nRet( 0 );
+ bool nRet = false;
if ( m_pListBoxListener )
nRet = m_pListBoxListener->PreNotify( rNEvt );
- if ( nRet == 0 )
+ if ( !nRet )
nRet = ListBox::PreNotify( rNEvt );
return nRet;
@@ -205,9 +205,9 @@ void DropdownToolbarController::LoseFocus()
notifyFocusLost();
}
-long DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ )
+bool DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ )
{
- return 0;
+ return false;
}
// --------------------------------------------------------
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 251f5b5..954d3ae 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -61,7 +61,7 @@ class EditControl : public Edit
virtual void KeyInput( const ::KeyEvent& rKEvt );
virtual void GetFocus();
virtual void LoseFocus();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
private:
IEditListener* m_pEditListener;
@@ -106,12 +106,12 @@ void EditControl::LoseFocus()
m_pEditListener->LoseFocus();
}
-long EditControl::PreNotify( NotifyEvent& rNEvt )
+bool EditControl::PreNotify( NotifyEvent& rNEvt )
{
- long nRet( 0 );
+ bool nRet = false;
if ( m_pEditListener )
nRet = m_pEditListener->PreNotify( rNEvt );
- if ( nRet == 0 )
+ if ( !nRet )
nRet = Edit::PreNotify( rNEvt );
return nRet;
@@ -196,7 +196,7 @@ void EditToolbarController::LoseFocus()
notifyFocusLost();
}
-long EditToolbarController::PreNotify( NotifyEvent& rNEvt )
+bool EditToolbarController::PreNotify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -207,11 +207,11 @@ long EditToolbarController::PreNotify( NotifyEvent& rNEvt )
// Call execute only with non-empty text
if ( !m_pEditControl->GetText().isEmpty() )
execute( rKeyCode.GetModifier() );
- return 1;
+ return true;
}
}
- return 0;
+ return false;
}
// --------------------------------------------------------
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index ad0f09d..a6f702d 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -73,7 +73,7 @@ class SpinfieldControl : public SpinField
virtual void LoseFocus();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
private:
ISpinfieldListener* m_pSpinFieldListener;
@@ -160,12 +160,12 @@ void SpinfieldControl::DataChanged( const DataChangedEvent& rDCEvt )
m_pSpinFieldListener->DataChanged( rDCEvt );
}
-long SpinfieldControl::PreNotify( NotifyEvent& rNEvt )
+bool SpinfieldControl::PreNotify( NotifyEvent& rNEvt )
{
- long nRet( 0 );
+ bool nRet = false;
if ( m_pSpinFieldListener )
nRet = m_pSpinFieldListener->PreNotify( rNEvt );
- if ( nRet == 0 )
+ if ( !nRet )
nRet = SpinField::PreNotify( rNEvt );
return nRet;
@@ -318,7 +318,7 @@ void SpinfieldToolbarController::DataChanged( const DataChangedEvent& /*rDCEvt*/
{
}
-long SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt )
+bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -329,11 +329,11 @@ long SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt )
// Call execute only with non-empty text
if ( !m_pSpinfieldControl->GetText().isEmpty() )
execute( rKeyCode.GetModifier() );
- return 1;
+ return true;
}
}
- return 0;
+ return false;
}
// --------------------------------------------------------
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index a8f3fb1..94cfa93 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -53,7 +53,7 @@ namespace dbaui
// initialize will be called when after the controller finished his initialize method
virtual void initialize(){}
// window overridables
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index fc0c8b3..683a9e3 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -64,7 +64,7 @@ private:
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputDoneAfter( sal_Bool bForced = sal_False );
@@ -108,7 +108,7 @@ protected:
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputDoneAfter( sal_Bool bForced = sal_False );
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 2543187..7985bd6 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -108,7 +108,7 @@ namespace svt
void implConstruct();
// Window overridables
- virtual long PreNotify( NotifyEvent& _rNEvt );
+ virtual bool PreNotify( NotifyEvent& _rNEvt );
// implementations
void implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar);
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index e28513e..6d36aea 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -203,7 +203,7 @@ namespace svt
protected:
// Window overridables
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
// MultiLineEdit overridables
virtual void Modify();
@@ -288,7 +288,7 @@ namespace svt
~CheckBoxControl();
virtual void GetFocus();
- virtual long PreNotify(NotifyEvent& rEvt);
+ virtual bool PreNotify(NotifyEvent& rEvt);
virtual void Paint(const Rectangle& rClientRect);
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
virtual void StateChanged( StateChangedType nStateChange );
@@ -337,7 +337,7 @@ namespace svt
ComboBoxControl(Window* pParent, WinBits nWinStyle = 0);
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
};
//==================================================================
@@ -370,7 +370,7 @@ namespace svt
ListBoxControl(Window* pParent, WinBits nWinStyle = 0);
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
};
//==================================================================
@@ -528,7 +528,7 @@ namespace svt
using BrowseBox::MouseButtonUp;
using BrowseBox::MouseButtonDown;
- virtual long PreNotify(NotifyEvent& rNEvt );
+ virtual bool PreNotify(NotifyEvent& rNEvt );
virtual bool Notify(NotifyEvent& rNEvt);
virtual void EndScroll();
diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx
index 6f1444c..2276e01 100644
--- a/include/svtools/editsyntaxhighlighter.hxx
+++ b/include/svtools/editsyntaxhighlighter.hxx
@@ -36,7 +36,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit
virtual void DoBracketHilight(sal_uInt16 aKey);
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL);
diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx
index 7ff42f5..2d113cf 100644
--- a/include/svtools/fileurlbox.hxx
+++ b/include/svtools/fileurlbox.hxx
@@ -40,7 +40,7 @@ namespace svt
FileURLBox( Window* _pParent, WinBits _nStyle );
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
public:
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index fbc882ed..e70f147 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -255,7 +255,7 @@ protected:
virtual SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; }
SvNumberFormatter* ImplGetFormatter() const { return m_pFormatter ? m_pFormatter : ((FormattedField*)this)->CreateFormatter(); }
- long PreNotify(NotifyEvent& rNEvt);
+ bool PreNotify(NotifyEvent& rNEvt);
virtual void ReFormat();
};
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index dfa15ca..d0d3a00 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -55,7 +55,7 @@ protected:
virtual bool Notify( NotifyEvent& rNEvt );
virtual void Select();
virtual void Modify();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
SvtURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true );
diff --git a/include/svtools/roadmap.hxx b/include/svtools/roadmap.hxx
index d1c51c0..1febec3 100644
--- a/include/svtools/roadmap.hxx
+++ b/include/svtools/roadmap.hxx
@@ -89,7 +89,7 @@ namespace svt
protected:
- long PreNotify( NotifyEvent& rNEvt );
+ bool PreNotify( NotifyEvent& rNEvt );
protected:
/// called when an item has been selected by any means
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index b105fbe..7c5368a 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -31,7 +31,7 @@ private:
SvSimpleTable* m_pTable;
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
SvSimpleTableContainer( Window* pParent, const ResId& rResId );
diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx
index 155094e..ed136c6 100644
--- a/include/svtools/urlcontrol.hxx
+++ b/include/svtools/urlcontrol.hxx
@@ -40,7 +40,7 @@ namespace svt
OFileURLControl(Window* _pParent, const ResId& _rId);
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
};
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index e3e59f1..673f604 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -309,7 +309,7 @@ protected:
virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY);
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId);
virtual void Command(const CommandEvent& rEvt);
- virtual long PreNotify(NotifyEvent& rEvt);
+ virtual bool PreNotify(NotifyEvent& rEvt);
virtual void KeyInput(const KeyEvent& rEvt);
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 66a8da9..584c382 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -55,7 +55,7 @@ public:
protected:
virtual void Select();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -87,7 +87,7 @@ public:
protected:
virtual void Select();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -112,7 +112,7 @@ protected:
virtual void Down();
virtual void Up(); // just to be sure
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -139,7 +139,7 @@ public:
sal_Bool IsRelease() { return bRelease;}
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
private:
@@ -161,7 +161,7 @@ public:
sal_Bool IsRelease() { return bRelease;}
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void Select();
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index 0afca8c..149f73a 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -70,7 +70,7 @@ class RubyEdit : public Edit
Link aScrollHdl;
Link aJumpHdl;
virtual void GetFocus();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
RubyEdit(Window* pParent, const ResId& rResId)
: Edit(pParent, rResId)
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index b1a1179..17a2228 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -159,7 +159,7 @@ public:
virtual void LoseFocus();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
virtual void Toggle();
@@ -357,7 +357,7 @@ public:
virtual void LoseFocus();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void Toggle();
@@ -472,7 +472,7 @@ public:
virtual void LoseFocus();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void Toggle();
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 81849c4..fd49eaa 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -96,7 +96,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 bool PreNotify( 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 b75b4dd..acc59a3 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -486,7 +486,7 @@ public:
explicit PatternField( Window* pParent, WinBits nWinStyle );
virtual ~PatternField();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void Modify();
};
@@ -506,7 +506,7 @@ public:
explicit NumericField( Window* pParent, const ResId& );
virtual ~NumericField();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -536,7 +536,7 @@ public:
explicit MetricField( Window* pParent, const ResId& );
virtual ~MetricField();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -604,7 +604,7 @@ public:
~CurrencyField();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -636,7 +636,7 @@ public:
explicit DateField( Window* pParent, const ResId& );
virtual ~DateField();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -672,7 +672,7 @@ public:
explicit TimeField( Window* pParent, const ResId& );
virtual ~TimeField();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -702,7 +702,7 @@ public:
PatternBox( Window* pParent, WinBits nWinStyle );
~PatternBox();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void Modify();
@@ -724,7 +724,7 @@ public:
virtual Size CalcMinimumSize() const;
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -746,7 +746,7 @@ public:
explicit MetricBox( Window* pParent, WinBits nWinStyle );
virtual ~MetricBox();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -780,7 +780,7 @@ public:
explicit CurrencyBox( Window* pParent, const ResId& );
virtual ~CurrencyBox();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -801,7 +801,7 @@ public:
explicit DateBox( Window* pParent, WinBits nWinStyle );
virtual ~DateBox();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -821,7 +821,7 @@ public:
explicit TimeBox( Window* pParent, WinBits nWinStyle );
virtual ~TimeBox();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index be53773..cc08b95 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -92,7 +92,7 @@ public:
LongCurrencyField( Window* pParent, WinBits nWinStyle );
~LongCurrencyField();
- long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
void Modify();
@@ -119,7 +119,7 @@ public:
LongCurrencyBox( Window* pParent, WinBits nWinStyle );
~LongCurrencyBox();
- long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
void Modify();
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index e57ea80..c918d1e 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -84,7 +84,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 bool PreNotify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index f78bda1..e17042c 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -102,7 +102,7 @@ public:
virtual void Resize();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
virtual void LoseFocus();
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index c7b50b2..dedff14 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -83,7 +83,7 @@ public:
long GetValue() const { return mnValue; }
void SetValueStep( long nNewStep ) { mnValueStep = nNewStep; }
long GetValueStep() const { return mnValueStep; }
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; }
const Link& GetUpHdl() const { return maUpHdlLink; }
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index d987743..06e31e4 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -89,7 +89,7 @@ public:
virtual void Resize();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; }
const Link& GetUpHdl() const { return maUpHdlLink; }
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 6eb6dfb..65fe65b 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -161,7 +161,7 @@ public:
virtual void RequestHelp( const HelpEvent& rHEvt );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize,
sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0,
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index c26c637..8223483 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -176,7 +176,7 @@ protected:
public:
~SystemWindow();
virtual bool Notify( NotifyEvent& rNEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual sal_Bool Close();
virtual void TitleButtonClick( sal_uInt16 nButton );
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index e253440..263e648 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -106,7 +106,7 @@ public:
virtual bool Notify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void ActivatePage();
virtual long DeactivatePage();
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index ef12a37..29f6a35 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -47,7 +47,7 @@ protected:
DECL_LINK( ImpUpdateDataHdl, void* );
void StateChanged( StateChangedType nType );
void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
using Control::ImplInitSettings;
void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 14d2b69..b2ef51c 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -597,7 +597,7 @@ public:
virtual void UserEvent( sal_uLong nEvent, void* pEventData );
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual bool Notify( NotifyEvent& rNEvt );
virtual Window* GetPreferredKeyInputWindow();
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index db7fea2..a938abe 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -245,7 +245,7 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindow::getSelectedFieldDescripto
}
//-----------------------------------------------------------------------
-long OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt )
+bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt )
{
if ( EVENT_KEYINPUT == _rNEvt.GetType() )
{
@@ -255,7 +255,7 @@ long OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt )
if ( m_aCreateLink.IsSet() )
{
m_aCreateLink.Call(this);
- return 1;
+ return true;
}
}
}
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 3b6d97d..3bf741a 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -494,7 +494,7 @@ namespace rptui
}
// -----------------------------------------------------------------------------
- long ConditionalFormattingDialog::PreNotify( NotifyEvent& _rNEvt )
+ bool ConditionalFormattingDialog::PreNotify( NotifyEvent& _rNEvt )
{
switch ( _rNEvt.GetType() )
{
@@ -507,12 +507,12 @@ namespace rptui
if ( rKeyCode.GetCode() == 0x0508 ) // -
{
impl_deleteCondition_nothrow( impl_getFocusedConditionIndex( 0 ) );
- return 1;
+ return true;
}
if ( rKeyCode.GetCode() == 0x0507 ) // +
{
impl_addCondition_nothrow( impl_getFocusedConditionIndex( impl_getConditionCount() - 1 ) + 1 );
- return 1;
+ return true;
}
}
}
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index bee2784..ba882ec 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -82,7 +82,7 @@ public:
virtual ~OAddFieldWindow();
virtual void Resize();
virtual void GetFocus();
- virtual long PreNotify( NotifyEvent& _rNEvt );
+ virtual bool PreNotify( NotifyEvent& _rNEvt );
inline const OUString& GetCommand() const { return m_aCommandName; }
inline sal_Int32 GetCommandType() const { return m_nCommandType; }
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 4d8fa7c..57cf214 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -110,7 +110,7 @@ namespace rptui
virtual OUString getDataField() const;
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
private:
DECL_LINK( OnScroll, ScrollBar* );
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 9bf6818..3ad2862 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -102,7 +102,7 @@ namespace rptui
// window overloads
virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void GetFocus();
// set the view readonly or not
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 3ca115c..b07fb4b 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -192,29 +192,29 @@ void ODesignView::DataChanged( const DataChangedEvent& rDCEvt )
}
}
//------------------------------------------------------------------------------
-long ODesignView::PreNotify( NotifyEvent& rNEvt )
+bool ODesignView::PreNotify( NotifyEvent& rNEvt )
{
- long nRet = ODataView::PreNotify(rNEvt); // 1 := has to be handled here
+ bool nRet = ODataView::PreNotify(rNEvt); // 1 := has to be handled here
switch(rNEvt.GetType())
{
case EVENT_KEYINPUT:
if ( (m_pPropWin && m_pPropWin->HasChildPathFocus()) )
- return 0L;
+ return false;
if ( (m_pAddField && m_pAddField->HasChildPathFocus()) )
- return 0L;
+ return false;
if ( (m_pReportExplorer && m_pReportExplorer->HasChildPathFocus()) )
- return 0L;
+ return false;
{
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
if ( handleKeyEvent(*pKeyEvent) )
- nRet = 1L;
- else if ( nRet == 1L && m_pAccel.get() )
+ nRet = true;
+ else if ( nRet && m_pAccel.get() )
{
const KeyCode& rCode = pKeyEvent->GetKeyCode();
util::URL aUrl;
aUrl.Complete = m_pAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rCode));
if ( aUrl.Complete.isEmpty() || !m_rController.isCommandEnabled( aUrl.Complete ) )
- nRet = 0L;
+ nRet = false;
}
}
break;
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index d097dd8..941d650 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -213,7 +213,7 @@ public:
void ReInit(ScViewData* ptrViewData);
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
void Initialize (SfxChildWinInfo* pInfo);
virtual void FillInfo(SfxChildWinInfo&) const;
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index afea5fd..873a4c3 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -180,7 +180,7 @@ class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler
{
public:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nStateChange );
protected:
ScRefHdlModalImpl(Window* pParent, const OString& rID,
@@ -193,7 +193,7 @@ template< class TWindow, bool bBindRef = true >
class ScRefHdlrImplBase: public TWindow, public ScRefHandler
{
public:
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nStateChange );
private:
@@ -255,7 +255,7 @@ template<class TWindow, bool bBindRef >
ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){}
template<class TWindow, bool bBindRef>
-long ScRefHdlrImplBase<TWindow, bBindRef>::PreNotify( NotifyEvent& rNEvt )
+bool ScRefHdlrImplBase<TWindow, bBindRef>::PreNotify( NotifyEvent& rNEvt )
{
ScRefHandler::preNotify( rNEvt, bBindRef );
return TWindow::PreNotify( rNEvt );
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index 232bb74..57301c2 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -45,7 +45,7 @@ class ScListBox : public ListBox
protected:
virtual void KeyInput( const KeyEvent& rKEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
public:
ScListBox( Window* pParent, const ResId& rResId );
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index d5311da..2e1d9ba 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -319,7 +319,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void MouseButtonUp( const MouseEvent& rMEvt );
virtual void MouseMove( const MouseEvent& rMEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void Tracking( const TrackingEvent& rTEvt );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index ec779d1..af07769 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -131,7 +131,7 @@ public:
void SetMenuHdl( const Link& rLink ) { aMLink = rLink; }
const Link& GetMenuHdl() const { return aMLink; }
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
};
#endif // SC_TPHFEDIT_HXX
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index c6aadee..49f3da5 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -749,7 +749,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC
return pEntry;
}
-long ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt )
+bool ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt )
{
if(rNEvt.GetType()==EVENT_GETFOCUS && bNeedsUpdate)
{
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 5f04c4c..5a1db22 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -1038,7 +1038,7 @@ ScRefHdlModalImpl::ScRefHdlModalImpl(Window* pParent, const OString& rID,
{
}
-long ScRefHdlModalImpl::PreNotify( NotifyEvent& rNEvt )
+bool ScRefHdlModalImpl::PreNotify( NotifyEvent& rNEvt )
{
ScRefHandler::preNotify( rNEvt, true );
return ModalDialog::PreNotify( rNEvt );
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 22ac0d4..abcb31c 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -440,7 +440,7 @@ void ScExtIButton::StartPopup()
}
}
-long ScExtIButton::PreNotify( NotifyEvent& rNEvt )
+bool ScExtIButton::PreNotify( NotifyEvent& rNEvt )
{
sal_uInt16 nSwitch=rNEvt.GetType();
if(nSwitch==EVENT_MOUSEBUTTONUP)
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5782e7c..e6ec4cb 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -221,7 +221,7 @@ public:
SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode );
~ScFilterListBox();
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual bool PreNotify( NotifyEvent& rNEvt );
virtual void Select();
SCCOL GetCol() const { return nCol; }
@@ -281,9 +281,9 @@ void ScFilterListBox::LoseFocus()
// -----------------------------------------------------------------------
-long ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
+bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
{
- long nDone = 0;
+ bool nDone = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
@@ -294,17 +294,17 @@ long ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
if ( nKey == KEY_RETURN )
{
SelectHdl(); // auswaehlen
- nDone = 1;
+ nDone = true;
}
else if ( nKey == KEY_ESCAPE )
{
pGridWin->ClickExtern(); // loescht die List-Box !!!
- nDone = 1;
+ nDone = true;
}
}
}
- return nDone ? nDone : ListBox::PreNotify( rNEvt );
+ return nDone || ListBox::PreNotify( rNEvt );
}
void ScFilterListBox::Select()
@@ -2707,7 +2707,7 @@ static void lcl_InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent, const
rEvent.PopupTrigger = false;
}
-long ScGridWindow::PreNotify( NotifyEvent& rNEvt )
+bool ScGridWindow::PreNotify( NotifyEvent& rNEvt )
{
bool bDone = false;
sal_uInt16 nType = rNEvt.GetType();
@@ -2751,7 +2751,7 @@ long ScGridWindow::PreNotify( NotifyEvent& rNEvt )
}
}
- return 1;
+ return true;
}
else
return Window::PreNotify( rNEvt );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 809f3a8..7c3677d 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -361,7 +361,7 @@ public:
~DropdownMenuBox();
void Resize();
- long PreNotify( NotifyEvent& rNEvt );
+ bool PreNotify( NotifyEvent& rNEvt );
void SetMenuSelectHdl( const Link& rLink ) { mpDropdownButton->SetSelectHdl( rLink ); }
@@ -411,9 +411,9 @@ void DropdownMenuBox::Resize()
// --------------------------------------------------------------------
-long DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
+bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
{
- long nResult=sal_True;
+ bool nResult = true;
sal_uInt16 nSwitch=rNEvt.GetType();
if (nSwitch==EVENT_KEYINPUT)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index f0314e5..a1eed29 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list