summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/tbcontrl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/tbxctrls/tbcontrl.cxx')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 8216a9f7d3c3..aa3b63eb9412 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -464,11 +464,11 @@ void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily )
bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
{
- sal_uInt16 nType = rNEvt.GetType();
+ MouseNotifyEvent nType = rNEvt.GetType();
- if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
+ if ( MouseNotifyEvent::MOUSEBUTTONDOWN == nType || MouseNotifyEvent::GETFOCUS == nType )
nCurSel = GetSelectEntryPos();
- else if ( EVENT_LOSEFOCUS == nType )
+ else if ( MouseNotifyEvent::LOSEFOCUS == nType )
{
// don't handle before our Select() is called
if ( !HasFocus() && !HasChildPathFocus() )
@@ -481,7 +481,7 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
{
bool nHandled = false;
- if ( rNEvt.GetType() == EVENT_KEYINPUT )
+ if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
@@ -933,9 +933,9 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
{
- sal_uInt16 nType = rNEvt.GetType();
+ MouseNotifyEvent nType = rNEvt.GetType();
- if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
+ if ( MouseNotifyEvent::MOUSEBUTTONDOWN == nType || MouseNotifyEvent::GETFOCUS == nType )
{
EnableControls_Impl();
FillList();
@@ -947,10 +947,10 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
{
bool nHandled = false;
mbEndPreview = false;
- if ( rNEvt.GetType() == EVENT_KEYUP )
+ if ( rNEvt.GetType() == MouseNotifyEvent::KEYUP )
mbEndPreview = true;
- if ( rNEvt.GetType() == EVENT_KEYINPUT )
+ if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
@@ -974,7 +974,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
break;
}
}
- else if ( EVENT_LOSEFOCUS == rNEvt.GetType() )
+ else if ( MouseNotifyEvent::LOSEFOCUS == rNEvt.GetType() )
{
vcl::Window* pFocusWin = Application::GetFocusWindow();
if ( !HasFocus() && GetSubEdit() != pFocusWin )