diff options
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 38 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.hxx | 10 |
2 files changed, 24 insertions, 24 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 77e7362b05ac..f0314e536652 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -387,17 +387,17 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) // ----------------------------------------------------------------------- -long ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) +bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); - bHandled = sal_True; + bHandled = true; } - return bHandled ? 1 : SvTreeListBox::Notify( rNEvt ); + return bHandled || SvTreeListBox::Notify( rNEvt ); } // ----------------------------------------------------------------------- @@ -494,17 +494,17 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) // ----------------------------------------------------------------------- -long IndexBox_Impl::Notify( NotifyEvent& rNEvt ) +bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); - bHandled = sal_True; + bHandled = true; } - return bHandled ? 1 : ComboBox::Notify( rNEvt ); + return bHandled || ComboBox::Notify( rNEvt ); } // ----------------------------------------------------------------------- @@ -931,17 +931,17 @@ void SearchBox_Impl::Select() // class SearchResultsBox_Impl ------------------------------------------- -long SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); - bHandled = sal_True; + bHandled = true; } - return bHandled ? 1 : ListBox::Notify( rNEvt ); + return bHandled || ListBox::Notify( rNEvt ); } // class SearchTabPage_Impl ---------------------------------------------- @@ -1308,9 +1308,9 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) // ----------------------------------------------------------------------- -long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) +bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) { - long nRet = 0; + bool nRet = false; sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_KEYINPUT == nType ) { @@ -1318,12 +1318,12 @@ long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_DELETE == nCode && GetEntryCount() > 0 ) { DoAction( MID_DELETE ); - nRet = 1; + nRet = true; } else if ( KEY_RETURN == nCode ) { GetDoubleClickHdl().Call( NULL ); - nRet = 1; + nRet = true; } } else if ( EVENT_COMMAND == nType ) @@ -1335,11 +1335,11 @@ long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) sal_uInt16 nId = aMenu.Execute( this, pCEvt->GetMousePosPixel() ); if ( nId != MENU_ITEM_NOTFOUND ) DoAction( nId ); - nRet = 1; + nRet = true; } } - return nRet ? nRet : ListBox::Notify( rNEvt ); + return nRet || ListBox::Notify( rNEvt ); } // class BookmarksTabPage_Impl ------------------------------------------- @@ -1989,7 +1989,7 @@ TextWin_Impl::~TextWin_Impl() { } -long TextWin_Impl::Notify( NotifyEvent& rNEvt ) +bool TextWin_Impl::Notify( NotifyEvent& rNEvt ) { if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_TAB ) return GetParent()->Notify( rNEvt ); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 0ebbcf65d645..3a5226afa041 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -85,7 +85,7 @@ public: virtual void RequestingChildren( SvTreeListEntry* pParent ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); } OUString GetSelectEntry() const; @@ -133,7 +133,7 @@ public: IndexBox_Impl( Window* pParent, const ResId& rResId ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void SelectExecutableEntry(); }; @@ -207,7 +207,7 @@ class SearchResultsBox_Impl : public ListBox public: SearchResultsBox_Impl( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) {} - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; class SearchTabPage_Impl : public HelpTabPage_Impl @@ -264,7 +264,7 @@ public: BookmarksBox_Impl( Window* pParent, const ResId& rResId ); ~BookmarksBox_Impl(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; class BookmarksTabPage_Impl : public HelpTabPage_Impl @@ -419,7 +419,7 @@ public: TextWin_Impl( Window* pParent ); virtual ~TextWin_Impl(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; // class SfxHelpTextWindow_Impl ------------------------------------------ |