[Libreoffice-commits] core.git: accessibility/inc accessibility/source avmedia/source basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source filter/source framework/source include/svtools include/vcl reportdesign/source sc/source sd/source sfx2/source svtools/source svx/source sw/source toolkit/source vcl/osx vcl/source vcl/unx
Noel Grandin
noel.grandin at collabora.co.uk
Wed Dec 7 07:11:16 UTC 2016
accessibility/inc/extended/listboxaccessible.hxx | 2
accessibility/source/extended/accessibleiconchoicectrl.cxx | 4
accessibility/source/extended/accessiblelistbox.cxx | 22
accessibility/source/extended/accessibletabbar.cxx | 12
accessibility/source/extended/accessibletabbarbase.cxx | 6
accessibility/source/extended/accessibletabbarpagelist.cxx | 22
accessibility/source/extended/accessibletablistboxtable.cxx | 25
accessibility/source/extended/listboxaccessible.cxx | 3
accessibility/source/extended/textwindowaccessibility.cxx | 7
accessibility/source/standard/accessiblemenubasecomponent.cxx | 32 -
accessibility/source/standard/vclxaccessiblebox.cxx | 48 -
accessibility/source/standard/vclxaccessiblebutton.cxx | 2
accessibility/source/standard/vclxaccessiblecheckbox.cxx | 2
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx | 4
accessibility/source/standard/vclxaccessibleedit.cxx | 6
accessibility/source/standard/vclxaccessiblelist.cxx | 36 -
accessibility/source/standard/vclxaccessiblemenubar.cxx | 10
accessibility/source/standard/vclxaccessibleradiobutton.cxx | 2
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 2
accessibility/source/standard/vclxaccessiblestatusbar.cxx | 22
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 26
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 2
accessibility/source/standard/vclxaccessibletoolbox.cxx | 44 -
avmedia/source/opengl/oglwindow.cxx | 10
avmedia/source/viewer/mediaevent_impl.cxx | 12
basctl/source/accessibility/accessibledialogwindow.cxx | 22
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 2
cui/source/dialogs/screenshotannotationdlg.cxx | 8
cui/source/options/fontsubs.cxx | 2
cui/source/options/optfltr.cxx | 2
cui/source/tabpages/autocdlg.cxx | 2
dbaccess/source/ui/app/AppDetailView.cxx | 4
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/dlg/admincontrols.cxx | 14
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 2
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2
desktop/source/splash/splash.cxx | 2
extensions/source/update/ui/updatecheckui.cxx | 19
filter/source/pdf/pdffilter.cxx | 2
framework/source/dispatch/windowcommanddispatch.cxx | 4
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 4
include/svtools/dialogcontrolling.hxx | 8
include/svtools/ivctrl.hxx | 2
include/svtools/treelistbox.hxx | 2
include/vcl/ctrl.hxx | 2
include/vcl/menu.hxx | 2
include/vcl/svapp.hxx | 8
include/vcl/vclevent.hxx | 305 ++++------
include/vcl/window.hxx | 3
reportdesign/source/ui/report/ReportController.cxx | 2
reportdesign/source/ui/report/ReportControllerObserver.cxx | 4
sc/source/ui/Accessibility/AccessibleDocument.cxx | 5
sc/source/ui/app/inputhdl.cxx | 4
sc/source/ui/cctrl/checklistmenu.cxx | 2
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 8
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 8
sd/source/ui/annotations/annotationtag.cxx | 9
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/dlg/LayerTabBar.cxx | 4
sd/source/ui/framework/factories/FullScreenPane.cxx | 6
sd/source/ui/sidebar/LayoutMenu.cxx | 4
sd/source/ui/slideshow/showwin.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 12
sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx | 2
sd/source/ui/view/FormShellManager.cxx | 8
sd/source/ui/view/ViewShellManager.cxx | 8
sd/source/ui/view/tabcontr.cxx | 4
sfx2/source/notebookbar/PriorityHBox.cxx | 2
sfx2/source/sidebar/FocusManager.cxx | 12
sfx2/source/sidebar/SidebarController.cxx | 18
sfx2/source/toolbox/imgmgr.cxx | 4
sfx2/source/toolbox/tbxitem.cxx | 4
svtools/source/config/colorcfg.cxx | 2
svtools/source/config/extcolorcfg.cxx | 2
svtools/source/contnr/imivctl.hxx | 2
svtools/source/contnr/imivctl1.cxx | 6
svtools/source/contnr/ivctrl.cxx | 6
svtools/source/contnr/svimpbox.cxx | 16
svtools/source/contnr/svtabbx.cxx | 2
svtools/source/contnr/treelistbox.cxx | 14
svtools/source/control/roadmap.cxx | 2
svtools/source/control/tabbar.cxx | 16
svtools/source/control/toolbarmenuacc.cxx | 12
svtools/source/inc/svimpbox.hxx | 2
svtools/source/misc/dialogcontrolling.cxx | 2
svtools/source/table/tablecontrol.cxx | 4
svtools/source/uno/genericunodialog.cxx | 2
svtools/source/uno/popupwindowcontroller.cxx | 19
svtools/source/uno/svtxgridcontrol.cxx | 8
svtools/source/uno/unoiface.cxx | 4
svx/source/accessibility/AccessibleFrameSelector.cxx | 6
svx/source/fmcomp/gridcell.cxx | 52 -
svx/source/form/databaselocationinput.cxx | 4
svx/source/inc/gridcell.hxx | 10
svx/source/svdraw/sdrpaintwindow.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 4
sw/source/core/access/accdoc.cxx | 7
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 11
sw/source/uibase/docvw/SidebarWin.cxx | 4
sw/source/uibase/uiview/viewmdi.cxx | 5
toolkit/source/awt/animatedimagespeer.cxx | 4
toolkit/source/awt/stylesettings.cxx | 2
toolkit/source/awt/vclxaccessiblecomponent.cxx | 57 -
toolkit/source/awt/vclxmenu.cxx | 36 -
toolkit/source/awt/vclxspinbutton.cxx | 4
toolkit/source/awt/vclxtabpagecontainer.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 34 -
toolkit/source/awt/vclxwindow.cxx | 70 +-
toolkit/source/awt/vclxwindows.cxx | 45 -
vcl/osx/a11yfocustracker.cxx | 18
vcl/source/app/svapp.cxx | 38 -
vcl/source/app/vclevent.cxx | 6
vcl/source/control/button.cxx | 8
vcl/source/control/combobox.cxx | 32 -
vcl/source/control/ctrl.cxx | 6
vcl/source/control/edit.cxx | 20
vcl/source/control/fixedhyper.cxx | 2
vcl/source/control/imp_listbox.cxx | 2
vcl/source/control/listbox.cxx | 42 -
vcl/source/control/scrbar.cxx | 4
vcl/source/control/spinbtn.cxx | 4
vcl/source/control/spinfld.cxx | 8
vcl/source/control/tabctrl.cxx | 14
vcl/source/edit/vclmedit.cxx | 6
vcl/source/window/accessibility.cxx | 2
vcl/source/window/dialog.cxx | 2
vcl/source/window/dndeventdispatcher.cxx | 2
vcl/source/window/dockmgr.cxx | 12
vcl/source/window/dockwin.cxx | 2
vcl/source/window/event.cxx | 28
vcl/source/window/layout.cxx | 2
vcl/source/window/menu.cxx | 34 -
vcl/source/window/menubarwindow.cxx | 16
vcl/source/window/menufloatingwindow.cxx | 14
vcl/source/window/paint.cxx | 2
vcl/source/window/settings.cxx | 2
vcl/source/window/stacking.cxx | 4
vcl/source/window/status.cxx | 18
vcl/source/window/syswin.cxx | 6
vcl/source/window/toolbox.cxx | 12
vcl/source/window/toolbox2.cxx | 50 -
vcl/source/window/window.cxx | 30
vcl/source/window/winproc.cxx | 10
vcl/unx/gtk/a11y/atkutil.cxx | 40 -
147 files changed, 966 insertions(+), 940 deletions(-)
New commits:
commit 2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Dec 6 13:26:09 2016 +0200
convert VCLEVENT constants to scoped enum
Change-Id: Ic8ccb0a9715ec05182dacddab2c015b0de6a0fba
Reviewed-on: https://gerrit.libreoffice.org/31675
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx
index e93fa02..013644a 100644
--- a/accessibility/inc/extended/listboxaccessible.hxx
+++ b/accessibility/inc/extended/listboxaccessible.hxx
@@ -53,7 +53,7 @@ namespace accessibility
protected:
virtual ~ListBoxAccessibleBase( );
- /** will be called when our window broadcasts the VCLEVENT_OBJECT_DYING event
+ /** will be called when our window broadcasts the VclEventId::ObjectDying event
<p>Usually, you derive your class from both ListBoxAccessibleBase and XComponent,
and call XComponent::dispose here.</p>
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 194e52a..21c4a4a 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -63,7 +63,7 @@ namespace accessibility
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_LISTBOX_SELECT :
+ case VclEventId::ListboxSelect :
{
// First send an event that tells the listeners of a
// modified selection. The active descendant event is
@@ -88,7 +88,7 @@ namespace accessibility
}
break;
}
- case VCLEVENT_WINDOW_GETFOCUS :
+ case VclEventId::WindowGetFocus :
{
VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl();
if ( pCtrl && pCtrl->HasFocus() )
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 367e92a..2cb64e3 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -73,7 +73,7 @@ namespace accessibility
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_CHECKBOX_TOGGLE :
+ case VclEventId::CheckboxToggle :
{
if ( !getListBox() || !getListBox()->HasFocus() )
{
@@ -98,13 +98,13 @@ namespace accessibility
break;
}
- case VCLEVENT_LISTBOX_SELECT :
+ case VclEventId::ListboxSelect :
{
- OSL_FAIL("Debug: Treelist shouldn't use VCLEVENT_LISTBOX_SELECT");
+ OSL_FAIL("Debug: Treelist shouldn't use VclEventId::ListboxSelect");
break;
}
- case VCLEVENT_LISTBOX_TREESELECT:
+ case VclEventId::ListboxTreeSelect:
{
if ( getListBox() && getListBox()->HasFocus() )
{
@@ -116,7 +116,7 @@ namespace accessibility
}
}
break;
- case VCLEVENT_LISTBOX_TREEFOCUS:
+ case VclEventId::ListboxTreeFocus:
{
VclPtr<SvTreeListBox> pBox = getListBox();
bool bNeedFocus = false;
@@ -176,7 +176,7 @@ namespace accessibility
}
}
break;
- case VCLEVENT_LISTBOX_ITEMREMOVED:
+ case VclEventId::ListboxItemRemoved:
{
SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
@@ -200,8 +200,8 @@ namespace accessibility
break;
// #i92103#
- case VCLEVENT_ITEM_EXPANDED :
- case VCLEVENT_ITEM_COLLAPSED :
+ case VclEventId::ItemExpanded :
+ case VclEventId::ItemCollapsed :
{
SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
@@ -210,7 +210,7 @@ namespace accessibility
new AccessibleListBoxEntry( *getListBox(), pEntry, this );
Reference< XAccessible > xChild = pAccListBoxEntry;
const short nAccEvent =
- ( rVclWindowEvent.GetId() == VCLEVENT_ITEM_EXPANDED )
+ ( rVclWindowEvent.GetId() == VclEventId::ItemExpanded )
? AccessibleEventId::LISTBOX_ENTRY_EXPANDED
: AccessibleEventId::LISTBOX_ENTRY_COLLAPSED;
uno::Any aListBoxEntry;
@@ -290,8 +290,8 @@ namespace accessibility
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_SHOW:
- case VCLEVENT_WINDOW_HIDE:
+ case VclEventId::WindowShow:
+ case VclEventId::WindowHide:
{
}
break;
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 26ac2e7..431dbd0 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -67,7 +67,7 @@ namespace accessibility
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_ENABLED:
+ case VclEventId::WindowEnabled:
{
aNewValue <<= AccessibleStateType::SENSITIVE;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
@@ -75,7 +75,7 @@ namespace accessibility
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_DISABLED:
+ case VclEventId::WindowDisabled:
{
aOldValue <<= AccessibleStateType::ENABLED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
@@ -83,25 +83,25 @@ namespace accessibility
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_GETFOCUS:
+ case VclEventId::WindowGetFocus:
{
aNewValue <<= AccessibleStateType::FOCUSED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_LOSEFOCUS:
+ case VclEventId::WindowLoseFocus:
{
aOldValue <<= AccessibleStateType::FOCUSED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_SHOW:
+ case VclEventId::WindowShow:
{
aNewValue <<= AccessibleStateType::SHOWING;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_HIDE:
+ case VclEventId::WindowHide:
{
aOldValue <<= AccessibleStateType::SHOWING;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index f75d457..2e3a0a9 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -48,20 +48,20 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, v
vcl::Window* pEventWindow = rEvent.GetWindow();
OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" );
- if( ( rEvent.GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
+ if( ( rEvent.GetId() == VclEventId::TabbarPageRemoved ) &&
( (sal_uInt16)reinterpret_cast<sal_IntPtr>(rEvent.GetData()) == TabBar::PAGE_NOT_FOUND ) &&
( dynamic_cast< AccessibleTabBarPageList *> (this) != nullptr ) )
{
return;
}
- if ( !pEventWindow->IsAccessibilityEventsSuppressed() || (rEvent.GetId() == VCLEVENT_OBJECT_DYING) )
+ if ( !pEventWindow->IsAccessibilityEventsSuppressed() || (rEvent.GetId() == VclEventId::ObjectDying) )
ProcessWindowEvent( rEvent );
}
void AccessibleTabBarBase::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
- if( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING )
+ if( rVclWindowEvent.GetId() == VclEventId::ObjectDying )
ClearTabBarPointer();
}
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 9e80a3f..05848a5 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -178,7 +178,7 @@ namespace accessibility
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_ENABLED:
+ case VclEventId::WindowEnabled:
{
Any aNewValue;
aNewValue <<= AccessibleStateType::SENSITIVE;
@@ -187,7 +187,7 @@ namespace accessibility
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, Any(), aNewValue );
}
break;
- case VCLEVENT_WINDOW_DISABLED:
+ case VclEventId::WindowDisabled:
{
Any aOldValue;
aOldValue <<= AccessibleStateType::ENABLED;
@@ -196,7 +196,7 @@ namespace accessibility
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, Any() );
}
break;
- case VCLEVENT_WINDOW_SHOW:
+ case VclEventId::WindowShow:
{
Any aOldValue, aNewValue;
aNewValue <<= AccessibleStateType::SHOWING;
@@ -204,7 +204,7 @@ namespace accessibility
UpdateShowing( true );
}
break;
- case VCLEVENT_WINDOW_HIDE:
+ case VclEventId::WindowHide:
{
Any aOldValue, aNewValue;
aOldValue <<= AccessibleStateType::SHOWING;
@@ -212,12 +212,12 @@ namespace accessibility
UpdateShowing( false );
}
break;
- case VCLEVENT_TABBAR_PAGESELECTED:
+ case VclEventId::TabbarPageSelected:
{
// do nothing
}
break;
- case VCLEVENT_TABBAR_PAGEACTIVATED:
+ case VclEventId::TabbarPageActivated:
{
if ( m_pTabBar )
{
@@ -227,7 +227,7 @@ namespace accessibility
}
}
break;
- case VCLEVENT_TABBAR_PAGEDEACTIVATED:
+ case VclEventId::TabbarPageDeactivated:
{
if ( m_pTabBar )
{
@@ -237,7 +237,7 @@ namespace accessibility
}
}
break;
- case VCLEVENT_TABBAR_PAGEINSERTED:
+ case VclEventId::TabbarPageInserted:
{
if ( m_pTabBar )
{
@@ -247,7 +247,7 @@ namespace accessibility
}
}
break;
- case VCLEVENT_TABBAR_PAGEREMOVED:
+ case VclEventId::TabbarPageRemoved:
{
if ( m_pTabBar )
{
@@ -277,14 +277,14 @@ namespace accessibility
}
}
break;
- case VCLEVENT_TABBAR_PAGEMOVED:
+ case VclEventId::TabbarPageMoved:
{
Pair* pPair = static_cast<Pair*>(rVclWindowEvent.GetData());
if ( pPair )
MoveChild( pPair->A(), pPair->B() );
}
break;
- case VCLEVENT_TABBAR_PAGETEXTCHANGED:
+ case VclEventId::TabbarPageTextChanged:
{
sal_uInt16 nPageId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData());
sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 5298924..6b73a4a 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -65,21 +65,21 @@ namespace accessibility
{
if ( isAlive() )
{
- sal_uLong nEventId = rVclWindowEvent.GetId();
+ VclEventId nEventId = rVclWindowEvent.GetId();
switch ( nEventId )
{
- case VCLEVENT_OBJECT_DYING :
+ case VclEventId::ObjectDying :
{
m_pTabListBox->RemoveEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) );
m_pTabListBox = nullptr;
break;
}
- case VCLEVENT_CONTROL_GETFOCUS :
- case VCLEVENT_CONTROL_LOSEFOCUS :
+ case VclEventId::ControlGetFocus :
+ case VclEventId::ControlLoseFocus :
{
uno::Any aOldValue, aNewValue;
- if ( VCLEVENT_CONTROL_GETFOCUS == nEventId )
+ if ( VclEventId::ControlGetFocus == nEventId )
aNewValue <<= AccessibleStateType::FOCUSED;
else
aOldValue <<= AccessibleStateType::FOCUSED;
@@ -87,7 +87,7 @@ namespace accessibility
break;
}
- case VCLEVENT_LISTBOX_SELECT :
+ case VclEventId::ListboxSelect :
{
// First send an event that tells the listeners of a
// modified selection. The active descendant event is
@@ -131,7 +131,7 @@ namespace accessibility
}
break;
}
- case VCLEVENT_WINDOW_GETFOCUS :
+ case VclEventId::WindowGetFocus :
{
uno::Any aOldValue, aNewValue;
aNewValue <<= AccessibleStateType::FOCUSED;
@@ -139,14 +139,14 @@ namespace accessibility
break;
}
- case VCLEVENT_WINDOW_LOSEFOCUS :
+ case VclEventId::WindowLoseFocus :
{
uno::Any aOldValue, aNewValue;
aOldValue <<= AccessibleStateType::FOCUSED;
commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue );
break;
}
- case VCLEVENT_LISTBOX_TREESELECT:
+ case VclEventId::ListboxTreeSelect:
{
SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if (pEntry)
@@ -167,7 +167,7 @@ namespace accessibility
}
}
break;
- case VCLEVENT_LISTBOX_TREEFOCUS:
+ case VclEventId::ListboxTreeFocus:
{
if ( m_pTabListBox && m_pTabListBox->HasFocus() )
{
@@ -189,7 +189,7 @@ namespace accessibility
}
break;
- case VCLEVENT_CHECKBOX_TOGGLE :
+ case VclEventId::CheckboxToggle :
{
if ( m_pTabListBox && m_pTabListBox->HasFocus() )
{
@@ -212,7 +212,7 @@ namespace accessibility
break;
}
- case VCLEVENT_TABLECELL_NAMECHANGED :
+ case VclEventId::TableCellNameChanged :
{
if ( m_pTabListBox->IsTransientChildrenDisabled() )
{
@@ -247,6 +247,7 @@ namespace accessibility
}
break;
}
+ default: break;
}
}
}
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index 63cb02d..7814120 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -50,7 +50,7 @@ namespace accessibility
{
switch ( rEvent.GetId() )
{
- case VCLEVENT_OBJECT_DYING :
+ case VclEventId::ObjectDying :
{
if ( m_pWindow )
m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
@@ -58,6 +58,7 @@ namespace accessibility
dispose();
break;
}
+ default: break;
}
}
}
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 07a6708..6964ea4 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1629,7 +1629,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
{
switch (rEvent.GetId())
{
- case VCLEVENT_WINDOW_RESIZE:
+ case VclEventId::WindowResize:
{
::osl::MutexGuard aInternalGuard(GetMutex());
if (!isAlive())
@@ -1652,7 +1652,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
}
break;
}
- case VCLEVENT_WINDOW_GETFOCUS:
+ case VclEventId::WindowGetFocus:
{
::osl::MutexGuard aInternalGuard(GetMutex());
if (!isAlive())
@@ -1689,7 +1689,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
*/
break;
}
- case VCLEVENT_WINDOW_LOSEFOCUS:
+ case VclEventId::WindowLoseFocus:
{
::osl::MutexGuard aInternalGuard(GetMutex());
if (!isAlive())
@@ -1728,6 +1728,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
*/
break;
}
+ default: break;
}
}
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 957e824..0d8fb8d 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -542,82 +542,82 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen
switch ( rVclMenuEvent.GetId() )
{
- case VCLEVENT_MENU_SHOW:
- case VCLEVENT_MENU_HIDE:
+ case VclEventId::MenuShow:
+ case VclEventId::MenuHide:
{
UpdateVisible();
}
break;
- case VCLEVENT_MENU_HIGHLIGHT:
+ case VclEventId::MenuHighlight:
{
SetFocused( false );
UpdateFocused( nItemPos, true );
UpdateSelected( nItemPos, true );
}
break;
- case VCLEVENT_MENU_DEHIGHLIGHT:
+ case VclEventId::MenuDehighlight:
{
UpdateFocused( nItemPos, false );
UpdateSelected( nItemPos, false );
}
break;
- case VCLEVENT_MENU_SUBMENUACTIVATE:
+ case VclEventId::MenuSubmenuActivate:
{
}
break;
- case VCLEVENT_MENU_SUBMENUDEACTIVATE:
+ case VclEventId::MenuSubmenuDeactivate:
{
UpdateFocused( nItemPos, true );
}
break;
- case VCLEVENT_MENU_ENABLE:
+ case VclEventId::MenuEnable:
{
UpdateEnabled( nItemPos, true );
}
break;
- case VCLEVENT_MENU_DISABLE:
+ case VclEventId::MenuDisable:
{
UpdateEnabled( nItemPos, false );
}
break;
- case VCLEVENT_MENU_SUBMENUCHANGED:
+ case VclEventId::MenuSubmenuChanged:
{
RemoveChild( nItemPos );
InsertChild( nItemPos );
}
break;
- case VCLEVENT_MENU_INSERTITEM:
+ case VclEventId::MenuInsertItem:
{
InsertChild( nItemPos );
}
break;
- case VCLEVENT_MENU_REMOVEITEM:
+ case VclEventId::MenuRemoveItem:
{
RemoveChild( nItemPos );
}
break;
- case VCLEVENT_MENU_ACCESSIBLENAMECHANGED:
+ case VclEventId::MenuAccessibleNameChanged:
{
UpdateAccessibleName( nItemPos );
}
break;
- case VCLEVENT_MENU_ITEMTEXTCHANGED:
+ case VclEventId::MenuItemTextChanged:
{
UpdateAccessibleName( nItemPos );
UpdateItemText( nItemPos );
}
break;
- case VCLEVENT_MENU_ITEMCHECKED:
+ case VclEventId::MenuItemChecked:
{
UpdateChecked( nItemPos, true );
}
break;
- case VCLEVENT_MENU_ITEMUNCHECKED:
+ case VclEventId::MenuItemUnchecked:
{
UpdateChecked( nItemPos, false );
}
break;
- case VCLEVENT_OBJECT_DYING:
+ case VclEventId::ObjectDying:
{
if ( m_pMenu )
{
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 4a28c71..2c04343 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -66,8 +66,8 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_SHOW:
- case VCLEVENT_WINDOW_HIDE:
+ case VclEventId::WindowShow:
+ case VclEventId::WindowHide:
{
vcl::Window* pChildWindow = static_cast<vcl::Window *>(rVclWindowEvent.GetData());
// Just compare to the combo box text field. All other children
@@ -79,7 +79,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo
if ( ( pComboBox != nullptr ) && ( pChildWindow != nullptr ) )
if (pChildWindow == pComboBox->GetSubEdit())
{
- if (rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW)
+ if (rVclWindowEvent.GetId() == VclEventId::WindowShow)
{
// Instantiate text field.
getAccessibleChild (0);
@@ -110,9 +110,9 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_DROPDOWN_SELECT:
- case VCLEVENT_LISTBOX_SELECT:
- case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
+ case VclEventId::DropdownSelect:
+ case VclEventId::ListboxSelect:
+ case VclEventId::ListboxFocusItemChanged:
{
// Forward the call to the list child.
VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
@@ -133,7 +133,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
}
break;
}
- case VCLEVENT_DROPDOWN_OPEN:
+ case VclEventId::DropdownOpen:
{
VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
if ( pList == nullptr )
@@ -148,7 +148,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
}
break;
}
- case VCLEVENT_DROPDOWN_CLOSE:
+ case VclEventId::DropdownClose:
{
VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
if ( pList == nullptr )
@@ -169,7 +169,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
}
break;
}
- case VCLEVENT_COMBOBOX_SELECT:
+ case VclEventId::ComboboxSelect:
{
VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
if (pList != nullptr && m_xText.is())
@@ -189,16 +189,16 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
}
break;
}
- //case VCLEVENT_DROPDOWN_OPEN:
- //case VCLEVENT_DROPDOWN_CLOSE:
- case VCLEVENT_LISTBOX_DOUBLECLICK:
- case VCLEVENT_LISTBOX_SCROLLED:
- //case VCLEVENT_LISTBOX_SELECT:
- case VCLEVENT_LISTBOX_ITEMADDED:
- case VCLEVENT_LISTBOX_ITEMREMOVED:
- case VCLEVENT_COMBOBOX_ITEMADDED:
- case VCLEVENT_COMBOBOX_ITEMREMOVED:
- case VCLEVENT_COMBOBOX_SCROLLED:
+ //case VclEventId::DropdownOpen:
+ //case VclEventId::DropdownClose:
+ case VclEventId::ListboxDoubleClick:
+ case VclEventId::ListboxScrolled:
+ //case VclEventId::ListboxSelect:
+ case VclEventId::ListboxItemAdded:
+ case VclEventId::ListboxItemRemoved:
+ case VclEventId::ComboboxItemAdded:
+ case VclEventId::ComboboxItemRemoved:
+ case VclEventId::ComboboxScrolled:
{
// Forward the call to the list child.
VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
@@ -212,8 +212,8 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
break;
}
- //case VCLEVENT_COMBOBOX_SELECT:
- case VCLEVENT_COMBOBOX_DESELECT:
+ //case VclEventId::ComboboxSelect:
+ case VclEventId::ComboboxDeselect:
{
// Selection is handled by VCLXAccessibleList which operates on
// the same VCL object as this box does. In case of the
@@ -234,9 +234,9 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
break;
}
- case VCLEVENT_EDIT_MODIFY:
- case VCLEVENT_EDIT_SELECTIONCHANGED:
- case VCLEVENT_EDIT_CARETCHANGED:
+ case VclEventId::EditModify:
+ case VclEventId::EditSelectionChanged:
+ case VclEventId::EditCaretChanged:
// Modify/Selection events are handled by the combo box instead of
// directly by the edit field (Why?). Therefore, delegate this
// call to the edit field.
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index b7feea9..cd12ca8 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -57,7 +57,7 @@ void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowE
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_PUSHBUTTON_TOGGLE:
+ case VclEventId::PushbuttonToggle:
{
Any aOldValue;
Any aNewValue;
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 9221c10..8c71bb4 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -115,7 +115,7 @@ void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindo
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_CHECKBOX_TOGGLE:
+ case VclEventId::CheckboxToggle:
{
SetChecked( IsChecked() );
SetIndeterminate( IsIndeterminate() );
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 408e2be..55b4506 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -64,8 +64,8 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_DROPDOWN_OPEN:
- case VCLEVENT_DROPDOWN_CLOSE:
+ case VclEventId::DropdownOpen:
+ case VclEventId::DropdownClose:
{
break;
}
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 432315a..fa3d0bc 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -69,12 +69,12 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_EDIT_MODIFY:
+ case VclEventId::EditModify:
{
SetText( implGetText() );
}
break;
- case VCLEVENT_EDIT_CARETCHANGED:
+ case VclEventId::EditCaretChanged:
{
sal_Int32 nOldCaretPosition = m_nCaretPosition;
m_nCaretPosition = getCaretPosition();
@@ -92,7 +92,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
}
}
break;
- case VCLEVENT_EDIT_SELECTIONCHANGED:
+ case VclEventId::EditSelectionChanged:
{
VclPtr<vcl::Window> pWindow = GetWindow();
if (pWindow && pWindow->HasChildPathFocus())
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 38f6c39..e369ea3 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -337,18 +337,18 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_DROPDOWN_SELECT:
- case VCLEVENT_LISTBOX_SELECT:
+ case VclEventId::DropdownSelect:
+ case VclEventId::ListboxSelect:
if ( !m_bDisableProcessEvent )
UpdateSelection_Impl_Acc(b_IsDropDownList);
break;
- case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
+ case VclEventId::ListboxFocusItemChanged:
if ( !m_bDisableProcessEvent )
UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_cast<sal_uIntPtr>(rVclWindowEvent.GetData()),b_IsDropDownList);
break;
- case VCLEVENT_WINDOW_GETFOCUS:
+ case VclEventId::WindowGetFocus:
break;
- case VCLEVENT_CONTROL_GETFOCUS:
+ case VclEventId::ControlGetFocus:
{
VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
if (m_aBoxType == COMBOBOX && b_IsDropDownList)
@@ -386,28 +386,28 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
{
// Create a reference to this object to prevent an early release of the
- // listbox (VCLEVENT_OBJECT_DYING).
+ // listbox (VclEventId::ObjectDying).
Reference< XAccessible > xTemp = this;
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_DROPDOWN_OPEN:
+ case VclEventId::DropdownOpen:
notifyVisibleStates(true);
break;
- case VCLEVENT_DROPDOWN_CLOSE:
+ case VclEventId::DropdownClose:
notifyVisibleStates(false);
break;
- case VCLEVENT_LISTBOX_SCROLLED:
- case VCLEVENT_COMBOBOX_SCROLLED:
+ case VclEventId::ListboxScrolled:
+ case VclEventId::ComboboxScrolled:
UpdateEntryRange_Impl();
break;
- // The selection events VCLEVENT_COMBOBOX_SELECT and
- // VCLEVENT_COMBOBOX_DESELECT are not handled here because here we
+ // The selection events VclEventId::ComboboxSelect and
+ // VclEventId::ComboboxDeselect are not handled here because here we
// have no access to the edit field. Its text is necessary to
// identify the currently selected item.
- case VCLEVENT_OBJECT_DYING:
+ case VclEventId::ObjectDying:
{
dispose();
@@ -415,18 +415,18 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
break;
}
- case VCLEVENT_LISTBOX_ITEMREMOVED:
- case VCLEVENT_COMBOBOX_ITEMREMOVED:
+ case VclEventId::ListboxItemRemoved:
+ case VclEventId::ComboboxItemRemoved:
HandleChangedItemList (false, reinterpret_cast<sal_IntPtr>(
rVclWindowEvent.GetData()));
break;
- case VCLEVENT_LISTBOX_ITEMADDED:
- case VCLEVENT_COMBOBOX_ITEMADDED:
+ case VclEventId::ListboxItemAdded:
+ case VclEventId::ComboboxItemAdded:
HandleChangedItemList (true, reinterpret_cast<sal_IntPtr>(
rVclWindowEvent.GetData()));
break;
- case VCLEVENT_CONTROL_GETFOCUS:
+ case VclEventId::ControlGetFocus:
{
VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
// Added by IBM Symphony Acc team to handle the list item focus when List control get focus
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index ca91715..f1855c5 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -72,7 +72,7 @@ bool VCLXAccessibleMenuBar::IsFocused()
IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void )
{
OSL_ENSURE( rEvent.GetWindow(), "VCLXAccessibleMenuBar::WindowEventListener: no window!" );
- if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) )
+ if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VclEventId::ObjectDying ) )
{
ProcessWindowEvent( rEvent );
}
@@ -83,13 +83,13 @@ void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindow
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_GETFOCUS:
- case VCLEVENT_WINDOW_LOSEFOCUS:
+ case VclEventId::WindowGetFocus:
+ case VclEventId::WindowLoseFocus:
{
- SetFocused( rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS );
+ SetFocused( rVclWindowEvent.GetId() == VclEventId::WindowGetFocus );
}
break;
- case VCLEVENT_OBJECT_DYING:
+ case VclEventId::ObjectDying:
{
if ( m_pWindow )
{
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 23cae20..ab567e2 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -62,7 +62,7 @@ void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWi
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_RADIOBUTTON_TOGGLE:
+ case VclEventId::RadiobuttonToggle:
{
Any aOldValue;
Any aNewValue;
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 6fdf416..74e89b5 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -58,7 +58,7 @@ void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_SCROLLBAR_SCROLL:
+ case VclEventId::ScrollbarScroll:
{
NotifyAccessibleEvent( AccessibleEventId::VALUE_CHANGED, Any(), Any() );
}
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 3f4c0ae..22b4e22 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -148,7 +148,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_STATUSBAR_ITEMADDED:
+ case VclEventId::StatusbarItemAdded:
{
if ( m_pStatusBar )
{
@@ -158,7 +158,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
}
}
break;
- case VCLEVENT_STATUSBAR_ITEMREMOVED:
+ case VclEventId::StatusbarItemRemoved:
{
if ( m_pStatusBar )
{
@@ -179,30 +179,30 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
}
}
break;
- case VCLEVENT_STATUSBAR_ALLITEMSREMOVED:
+ case VclEventId::StatusbarAllItemsRemoved:
{
for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
RemoveChild( i );
}
break;
- case VCLEVENT_STATUSBAR_SHOWITEM:
- case VCLEVENT_STATUSBAR_HIDEITEM:
+ case VclEventId::StatusbarShowItem:
+ case VclEventId::StatusbarHideItem:
{
if ( m_pStatusBar )
{
sal_uInt16 nItemId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData());
sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId );
- UpdateShowing( nItemPos, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWITEM );
+ UpdateShowing( nItemPos, rVclWindowEvent.GetId() == VclEventId::StatusbarShowItem );
}
}
break;
- case VCLEVENT_STATUSBAR_SHOWALLITEMS:
+ case VclEventId::StatusbarShowAllItems:
{
for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
- UpdateShowing( i, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWALLITEMS );
+ UpdateShowing( i, rVclWindowEvent.GetId() == VclEventId::StatusbarShowAllItems );
}
break;
- case VCLEVENT_STATUSBAR_NAMECHANGED:
+ case VclEventId::StatusbarNameChanged:
{
if ( m_pStatusBar )
{
@@ -212,7 +212,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
}
}
break;
- case VCLEVENT_STATUSBAR_DRAWITEM:
+ case VclEventId::StatusbarDrawItem:
{
if ( m_pStatusBar )
{
@@ -222,7 +222,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
}
}
break;
- case VCLEVENT_OBJECT_DYING:
+ case VclEventId::ObjectDying:
{
if ( m_pStatusBar )
{
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 12837d6..637e0b6 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -161,19 +161,19 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_TABPAGE_ACTIVATE:
- case VCLEVENT_TABPAGE_DEACTIVATE:
+ case VclEventId::TabpageActivate:
+ case VclEventId::TabpageDeactivate:
{
if ( m_pTabControl )
{
sal_uInt16 nPageId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData());
sal_uInt16 nPagePos = m_pTabControl->GetPagePos( nPageId );
UpdateFocused();
- UpdateSelected( nPagePos, rVclWindowEvent.GetId() == VCLEVENT_TABPAGE_ACTIVATE );
+ UpdateSelected( nPagePos, rVclWindowEvent.GetId() == VclEventId::TabpageActivate );
}
}
break;
- case VCLEVENT_TABPAGE_PAGETEXTCHANGED:
+ case VclEventId::TabpagePageTextChanged:
{
if ( m_pTabControl )
{
@@ -183,7 +183,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
}
}
break;
- case VCLEVENT_TABPAGE_INSERTED:
+ case VclEventId::TabpageInserted:
{
if ( m_pTabControl )
{
@@ -193,7 +193,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
}
}
break;
- case VCLEVENT_TABPAGE_REMOVED:
+ case VclEventId::TabpageRemoved:
{
if ( m_pTabControl )
{
@@ -214,19 +214,19 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin
}
}
break;
- case VCLEVENT_TABPAGE_REMOVEDALL:
+ case VclEventId::TabpageRemovedAll:
{
for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
RemoveChild( i );
}
break;
- case VCLEVENT_WINDOW_GETFOCUS:
- case VCLEVENT_WINDOW_LOSEFOCUS:
+ case VclEventId::WindowGetFocus:
+ case VclEventId::WindowLoseFocus:
{
UpdateFocused();
}
break;
- case VCLEVENT_OBJECT_DYING:
+ case VclEventId::ObjectDying:
{
if ( m_pTabControl )
{
@@ -255,8 +255,8 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_SHOW:
- case VCLEVENT_WINDOW_HIDE:
+ case VclEventId::WindowShow:
+ case VclEventId::WindowHide:
{
if ( m_pTabControl )
{
@@ -268,7 +268,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
TabPage* pTabPage = m_pTabControl->GetTabPage( nPageId );
if ( pTabPage == static_cast<TabPage*>(pChild) )
- UpdateTabPage( i, rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW );
+ UpdateTabPage( i, rVclWindowEvent.GetId() == VclEventId::WindowShow );
}
}
}
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 8a0543f..3fa741f 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -74,7 +74,7 @@ void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVcl
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_FRAMETITLECHANGED:
+ case VclEventId::WindowFrameTitleChanged:
{
VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
SetText( implGetText() );
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 126e4c1..ab3ff81 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -507,13 +507,13 @@ void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelpe
void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
- // to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING)
+ // to prevent an early release of the toolbox (VclEventId::ObjectDying)
Reference< XAccessibleContext > xTemp = this;
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_TOOLBOX_CLICK:
- case VCLEVENT_TOOLBOX_SELECT:
+ case VclEventId::ToolboxClick:
+ case VclEventId::ToolboxSelect:
{
VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
if ( rVclWindowEvent.GetData() )
@@ -528,13 +528,13 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
}
break;
}
- case VCLEVENT_TOOLBOX_DOUBLECLICK:
- case VCLEVENT_TOOLBOX_ACTIVATE:
- case VCLEVENT_TOOLBOX_DEACTIVATE:
- //case VCLEVENT_TOOLBOX_SELECT:
+ case VclEventId::ToolboxDoubleClick:
+ case VclEventId::ToolboxActivate:
+ case VclEventId::ToolboxDeactivate:
+ //case VclEventId::ToolboxSelect:
break;
- case VCLEVENT_TOOLBOX_ITEMUPDATED:
+ case VclEventId::ToolboxItemUpdated:
{
if ( rVclWindowEvent.GetData() )
{
@@ -544,26 +544,26 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
break;
}
- case VCLEVENT_TOOLBOX_HIGHLIGHT:
+ case VclEventId::ToolboxHighlight:
UpdateFocus_Impl();
break;
- case VCLEVENT_TOOLBOX_HIGHLIGHTOFF:
+ case VclEventId::ToolboxHighlightOff:
ReleaseFocus_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
break;
- case VCLEVENT_TOOLBOX_ITEMADDED :
+ case VclEventId::ToolboxItemAdded :
UpdateItem_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
break;
- case VCLEVENT_TOOLBOX_ITEMREMOVED :
- case VCLEVENT_TOOLBOX_ALLITEMSCHANGED :
+ case VclEventId::ToolboxItemRemoved :
+ case VclEventId::ToolboxAllItemsChanged :
{
UpdateAllItems_Impl();
break;
}
- case VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED:
+ case VclEventId::ToolboxItemWindowChanged:
{
sal_Int32 nPos = (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData());
ToolBoxItemsMap::iterator aAccessiblePos( m_aAccessibleChildren.find( nPos ) );
@@ -578,25 +578,25 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewValue );
break;
}
- case VCLEVENT_TOOLBOX_ITEMTEXTCHANGED :
+ case VclEventId::ToolboxItemTextChanged :
UpdateItemName_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
break;
- case VCLEVENT_TOOLBOX_ITEMENABLED :
- case VCLEVENT_TOOLBOX_ITEMDISABLED :
+ case VclEventId::ToolboxItemEnabled :
+ case VclEventId::ToolboxItemDisabled :
{
UpdateItemEnabled_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
break;
}
- case VCLEVENT_DROPDOWN_OPEN:
- case VCLEVENT_DROPDOWN_CLOSE:
+ case VclEventId::DropdownOpen:
+ case VclEventId::DropdownClose:
{
- UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN );
+ UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VclEventId::DropdownOpen );
break;
}
- case VCLEVENT_OBJECT_DYING :
+ case VclEventId::ObjectDying :
{
// if this toolbox is a subtoolbox, we have to release it from its parent
VclPtr< vcl::Window > pWin = GetAs< vcl::Window >();
@@ -629,7 +629,7 @@ void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclW
{
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children
+ case VclEventId::WindowShow: // send create on show for direct accessible children
{
Reference< XAccessible > xReturn = GetItemWindowAccessible(rVclWindowEvent);
if ( xReturn.is() )
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 15ec0f7..88209d5 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -201,7 +201,7 @@ void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintL
IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
{
- if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
+ if( rEvent.GetId() == VclEventId::WindowMouseMove )
{
MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData());
if(pMouseEvt)
@@ -227,7 +227,7 @@ IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
{
- if( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT )
+ if( rEvent.GetId() == VclEventId::WindowKeyInput )
{
KeyEvent* pKeyEvt = static_cast<KeyEvent*>(rEvent.GetData());
if(pKeyEvt)
@@ -332,7 +332,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
}
}
}
- else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEBUTTONDOWN )
+ else if( rEvent.GetId() == VclEventId::WindowMouseButtonDown )
{
MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData());
if(pMouseEvt && pMouseEvt->IsLeft() && pMouseEvt->GetClicks() == 1)
@@ -340,7 +340,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
m_aLastMousePos = pMouseEvt->GetPosPixel();
}
}
- else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
+ else if( rEvent.GetId() == VclEventId::WindowMouseMove )
{
if ( !m_rEventHandler.HasFocus() )
{
@@ -374,7 +374,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
m_aLastMousePos = aCurPos;
}
}
- else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEBUTTONUP )
+ else if( rEvent.GetId() == VclEventId::WindowMouseButtonUp )
{
MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData());
if(pMouseEvt && pMouseEvt->IsLeft() && pMouseEvt->GetClicks() == 1)
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 61634bc..87ec80d 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -65,7 +65,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
- Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt );
+ Application::PostKeyEvent( VclEventId::WindowKeyInput, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt );
}
}
@@ -83,7 +83,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e
( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) |
( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
- Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt );
+ Application::PostKeyEvent( VclEventId::WindowKeyUp, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt );
}
}
@@ -103,7 +103,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent&
( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
e.Modifiers );
- Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
+ Application::PostMouseEvent( VclEventId::WindowMouseButtonDown, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
}
}
@@ -123,7 +123,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent
( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
e.Modifiers );
- Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
+ Application::PostMouseEvent( VclEventId::WindowMouseButtonUp, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
}
}
@@ -161,7 +161,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent&
if( mpNotifyWindow )
{
MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers );
- Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
+ Application::PostMouseEvent( VclEventId::WindowMouseMove, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
}
}
@@ -175,7 +175,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e
if( mpNotifyWindow )
{
MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers );
- Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
+ Application::PostMouseEvent( VclEventId::WindowMouseMove, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt );
}
}
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 6536258..0d3447a 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -331,7 +331,7 @@ void AccessibleDialogWindow::SortChildren()
IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void )
{
DBG_ASSERT(rEvent.GetWindow(), "AccessibleDialogWindow::WindowEventListener: no window!");
- if (!rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || rEvent.GetId() == VCLEVENT_OBJECT_DYING)
+ if (!rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || rEvent.GetId() == VclEventId::ObjectDying)
ProcessWindowEvent(rEvent);
}
@@ -342,62 +342,62 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo
switch ( rVclWindowEvent.GetId() )
{
- case VCLEVENT_WINDOW_ENABLED:
+ case VclEventId::WindowEnabled:
{
aNewValue <<= AccessibleStateType::ENABLED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_DISABLED:
+ case VclEventId::WindowDisabled:
{
aOldValue <<= AccessibleStateType::ENABLED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_ACTIVATE:
+ case VclEventId::WindowActivate:
{
aNewValue <<= AccessibleStateType::ACTIVE;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_DEACTIVATE:
+ case VclEventId::WindowDeactivate:
{
aOldValue <<= AccessibleStateType::ACTIVE;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_GETFOCUS:
+ case VclEventId::WindowGetFocus:
{
aNewValue <<= AccessibleStateType::FOCUSED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_LOSEFOCUS:
+ case VclEventId::WindowLoseFocus:
{
aOldValue <<= AccessibleStateType::FOCUSED;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_SHOW:
+ case VclEventId::WindowShow:
{
aNewValue <<= AccessibleStateType::SHOWING;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_HIDE:
+ case VclEventId::WindowHide:
{
aOldValue <<= AccessibleStateType::SHOWING;
NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
break;
- case VCLEVENT_WINDOW_RESIZE:
+ case VclEventId::WindowResize:
{
NotifyAccessibleEvent( AccessibleEventId::BOUNDRECT_CHANGED, aOldValue, aNewValue );
UpdateChildren();
UpdateBounds();
}
break;
- case VCLEVENT_OBJECT_DYING:
+ case VclEventId::ObjectDying:
{
if ( m_pDialogWindow )
{
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index c800580..065a511e 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -199,7 +199,7 @@ void CreationWizardUnoDlg::createDialogOnDemand()
}
IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void )
{
- if(rEvent.GetId() == VCLEVENT_OBJECT_DYING)
+ if(rEvent.GetId() == VclEventId::ObjectDying)
m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog
}
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 398458d..1c422fa 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -560,8 +560,8 @@ IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, r
switch (rEvent.GetId())
{
- case VCLEVENT_WINDOW_MOUSEMOVE:
- case VCLEVENT_WINDOW_MOUSEBUTTONUP:
+ case VclEventId::WindowMouseMove:
+ case VclEventId::WindowMouseButtonUp:
{
MouseEvent* pMouseEvent = static_cast< MouseEvent* >(rEvent.GetData());
@@ -569,7 +569,7 @@ IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, r
{
switch (rEvent.GetId())
{
- case VCLEVENT_WINDOW_MOUSEMOVE:
+ case VclEventId::WindowMouseMove:
{
if (mpPicture->IsMouseOver())
{
@@ -593,7 +593,7 @@ IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, r
}
break;
}
- case VCLEVENT_WINDOW_MOUSEBUTTONUP:
+ case VclEventId::WindowMouseButtonUp:
{
if (mpPicture->IsMouseOver() && mpHilighted)
{
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 7264c0d..103d03f 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -462,7 +462,7 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt )
if ( nCol < 2 )
{
CheckEntryPos( nSelPos, nCol, !IsChecked( nSelPos, nCol ) );
- CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, static_cast<void*>(GetEntry( nSelPos )) );
+ CallImplEventListeners( VclEventId::CheckboxToggle, static_cast<void*>(GetEntry( nSelPos )) );
}
else
{
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 6e791c8..7f997c7 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -449,7 +449,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt )
SvTreeListEntry* pEntry = GetEntry( nSelPos );
bool bIsChecked = ( GetCheckButtonState( pEntry, nCol ) == SvButtonState::Checked );
CheckEntryPos( nSelPos, nCol, !bIsChecked );
- CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, static_cast<void*>(pEntry) );
+ CallImplEventListeners( VclEventId::CheckboxToggle, static_cast<void*>(pEntry) );
}
else
{
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 3ebc03a..66f06e4 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -847,7 +847,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
if ( nCol < 2 )
{
CheckEntryPos( nSelPos, nCol, !IsChecked( nSelPos, nCol ) );
- CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, static_cast<void*>(GetEntry( nSelPos )) );
+ CallImplEventListeners( VclEventId::CheckboxToggle, static_cast<void*>(GetEntry( nSelPos )) );
}
else
{
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 4118915..d9f8a0b 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -286,7 +286,7 @@ bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry )
if ( GetCurEntry() )
{
InvalidateEntry( GetCurEntry() );
- CallEventListeners( VCLEVENT_LISTBOX_TREESELECT, GetCurEntry() );
+ CallEventListeners( VclEventId::ListboxTreeSelect, GetCurEntry() );
}
updateHelpText();
return true;
@@ -334,7 +334,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt )
if ( pNewCurrent )
{
InvalidateEntry( pNewCurrent );
- CallEventListeners( VCLEVENT_LISTBOX_SELECT, pNewCurrent );
+ CallEventListeners( VclEventId::ListboxSelect, pNewCurrent );
}
updateHelpText();
}
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 2fbf134..ccfca86 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -672,7 +672,7 @@ void DBTreeListBox::ExecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
IMPL_LINK( DBTreeListBox, MenuEventListener, VclMenuEvent&, rMenuEvent, void )
{
- if ( rMenuEvent.GetId() == VCLEVENT_OBJECT_DYING )
+ if ( rMenuEvent.GetId() == VclEventId::ObjectDying )
{
css::uno::Reference< css::lang::XComponent > xComponent( m_xMenuController, css::uno::UNO_QUERY );
if ( xComponent.is() )
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 8b493c9..46e6e45 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -40,9 +40,9 @@ namespace dbaui
// IWindowEventFilter
virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const override
{
- return ( _rEvent.GetId() == VCLEVENT_WINDOW_ENABLED )
- || ( _rEvent.GetId() == VCLEVENT_WINDOW_DISABLED )
- || ( _rEvent.GetId() == VCLEVENT_EDIT_MODIFY );
+ return ( _rEvent.GetId() == VclEventId::WindowEnabled )
+ || ( _rEvent.GetId() == VclEventId::WindowDisabled )
+ || ( _rEvent.GetId() == VclEventId::EditModify );
}
};
@@ -69,21 +69,21 @@ namespace dbaui
switch ( _rTrigger.GetId() )
{
- case 0:
+ case VclEventId::NONE:
// initial call
const_cast< TextResetOperator* >( this )->m_sUserText = _rTrigger.GetWindow()->GetText();
break;
- case VCLEVENT_EDIT_MODIFY:
+ case VclEventId::EditModify:
if ( _rTrigger.GetWindow()->IsEnabled() )
const_cast< TextResetOperator* >( this )->m_sUserText = _rTrigger.GetWindow()->GetText();
break;
- case VCLEVENT_WINDOW_ENABLED:
+ case VclEventId::WindowEnabled:
_rOperateOn.SetText( m_sUserText );
break;
- case VCLEVENT_WINDOW_DISABLED:
+ case VclEventId::WindowDisabled:
_rOperateOn.SetText( m_sDisabledText );
break;
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index 20d6065..e49e1be 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -76,7 +76,7 @@ namespace dbaui
}
IMPL_LINK(OToolBoxHelper, SettingsChanged, VclSimpleEvent&, _rEvt, void)
{
- if ( m_pToolBox && _rEvt.GetId() == VCLEVENT_APPLICATION_DATACHANGED )
+ if ( m_pToolBox && _rEvt.GetId() == VclEventId::ApplicationDataChanged )
{
DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(_rEvt).GetData());
if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) ||
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 6a2a609..5616112 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -51,7 +51,7 @@ namespace dbaui
}
void OTableWindowAccess::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
- if ( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING )
+ if ( rVclWindowEvent.GetId() == VclEventId::ObjectDying )
{
::osl::MutexGuard aGuard( m_aMutex );
m_pTable = nullptr;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 45c5fd4..46a9d65 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -996,7 +996,7 @@ bool ExtMgrDialog::EventNotify( NotifyEvent& rNEvt )
if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR )
bHandled = m_pExtensionBox->EventNotify(rNEvt);
}
-// VCLEVENT_WINDOW_CLOSE
+// VclEventId::WindowClose
if ( !bHandled )
return ModelessDialog::EventNotify(rNEvt);
else
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index a9b62cb..a7385ae 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -370,7 +370,7 @@ IMPL_LINK( SplashScreen, AppEventListenerHdl, VclSimpleEvent&, inEvent, void )
{
switch ( inEvent.GetId() )
{
- case VCLEVENT_WINDOW_SHOW:
+ case VclEventId::WindowShow:
pWindow->Redraw();
break;
default:
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index ab3b54c..d129789 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -656,9 +656,9 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl, void*, void)
IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void )
{
- sal_uLong nEventID = rEvent.GetId();
+ VclEventId nEventID = rEvent.GetId();
- if ( VCLEVENT_OBJECT_DYING == nEventID )
+ if ( VclEventId::ObjectDying == nEventID )
{
SolarMutexGuard aGuard;
if ( mpIconSysWin == rEvent.GetWindow() )
@@ -667,7 +667,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void )
RemoveBubbleWindow( true );
}
}
- else if ( VCLEVENT_WINDOW_MENUBARADDED == nEventID )
+ else if ( VclEventId::WindowMenubarAdded == nEventID )
{
SolarMutexGuard aGuard;
vcl::Window *pWindow = rEvent.GetWindow();
@@ -680,15 +680,15 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void )
}
}
}
- else if ( VCLEVENT_WINDOW_MENUBARREMOVED == nEventID )
+ else if ( VclEventId::WindowMenubarRemoved == nEventID )
{
SolarMutexGuard aGuard;
MenuBar *pMBar = static_cast<MenuBar*>(rEvent.GetData());
if ( pMBar && ( pMBar == mpIconMBar ) )
RemoveBubbleWindow( true );
}
- else if ( ( nEventID == VCLEVENT_WINDOW_MOVE ) ||
- ( nEventID == VCLEVENT_WINDOW_RESIZE ) )
+ else if ( ( nEventID == VclEventId::WindowMove ) ||
+ ( nEventID == VclEventId::WindowResize ) )
{
SolarMutexGuard aGuard;
if ( ( mpIconSysWin == rEvent.GetWindow() ) &&
@@ -708,9 +708,9 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void)
{
switch (rEvent.GetId())
{
- case VCLEVENT_WINDOW_SHOW:
- case VCLEVENT_WINDOW_ACTIVATE:
- case VCLEVENT_WINDOW_GETFOCUS: {
+ case VclEventId::WindowShow:
+ case VclEventId::WindowActivate:
+ case VclEventId::WindowGetFocus: {
SolarMutexGuard aGuard;
vcl::Window *pWindow = static_cast< VclWindowEvent * >(&rEvent)->GetWindow();
@@ -725,6 +725,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void)
}
break;
}
+ default: break;
}
}
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 478845a..9150cfd 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -165,7 +165,7 @@ public:
IMPL_LINK( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void )
{
- if( rEvent.GetId() == VCLEVENT_OBJECT_DYING )
+ if( rEvent.GetId() == VclEventId::ObjectDying )
m_pFocusWindow = nullptr;
}
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 1470007..adfce49 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -94,12 +94,12 @@ void WindowCommandDispatch::impl_stopListening()
IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, VclWindowEvent&, rEvent, void)
{
- if (rEvent.GetId() == VCLEVENT_OBJECT_DYING)
+ if (rEvent.GetId() == VclEventId::ObjectDying)
{
impl_stopListening();
return;
}
- if (rEvent.GetId() != VCLEVENT_WINDOW_COMMAND)
+ if (rEvent.GetId() != VclEventId::WindowCommand)
return;
const CommandEvent* pCommand = static_cast<CommandEvent*>(rEvent.GetData());
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 98cbace..eefd7dc 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -908,7 +908,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
// anymore!
if ( dynamic_cast< const VclWindowEvent* >(pEvent) != nullptr )
{
- if ( pEvent->GetId() == VCLEVENT_TOOLBOX_SELECT )
+ if ( pEvent->GetId() == VclEventId::ToolboxSelect )
{
OUString aToolbarName;
OUString aCommand;
@@ -956,7 +956,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
}
}
}
- else if ( pEvent->GetId() == VCLEVENT_TOOLBOX_FORMATCHANGED )
+ else if ( pEvent->GetId() == VclEventId::ToolboxFormatChanged )
{
if ( !implts_isToolbarCreationActive() )
{
diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx
index 020572b..eb993cd 100644
--- a/include/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
@@ -221,8 +221,8 @@ namespace svt
/** a helper class implementing the ->IWindowEventFilter interface,
which filters for radio buttons or check boxes being toggled.
- Technically, the class simply filters for the ->VCLEVENT_RADIOBUTTON_TOGGLE
- and the ->VCLEVENT_CHECKBOX_TOGGLE event.
+ Technically, the class simply filters for the ->VclEventId::RadiobuttonToggle
+ and the ->VclEventId::CheckboxToggle event.
*/
class SVT_DLLPUBLIC FilterForRadioOrCheckToggle : public IWindowEventFilter
{
@@ -236,8 +236,8 @@ namespace svt
bool payAttentionTo( const VclWindowEvent& _rEvent ) const override
{
if ( ( _rEvent.GetWindow() == &m_rWindow )
- && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE )
- || ( _rEvent.GetId() == VCLEVENT_CHECKBOX_TOGGLE )
+ && ( ( _rEvent.GetId() == VclEventId::RadiobuttonToggle )
+ || ( _rEvent.GetId() == VclEventId::CheckboxToggle )
)
)
return true;
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 995058d..8a27031 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -219,7 +219,7 @@ protected:
virtual void FillLayoutData() const override;
- void CallImplEventListeners(sal_uLong nEvent, void* pData);
+ void CallImplEventListeners(VclEventId nEvent, void* pData);
public:
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 54003c2..da18634 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -584,7 +584,7 @@ protected:
bool IsCellFocusEnabled() const;
bool SetCurrentTabPos( sal_uInt16 _nNewPos );
sal_uInt16 GetCurrentTabPos() const;
- void CallImplEventListeners(sal_uLong nEvent, void* pData);
+ void CallImplEventListeners(VclEventId nEvent, void* pData);
void ImplEditEntry( SvTreeListEntry* pEntry );
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 0d1f5f5..ca23031 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -72,7 +72,7 @@ protected:
if the Control instance has been destroyed in any of the call
*/
bool ImplCallEventListenersAndHandler(
- sal_uLong nEvent, std::function<void()> const & callHandler
+ VclEventId nEvent, std::function<void()> const & callHandler
);
/** draws the given text onto the given device
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index ca6f457..4a119a0 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -181,7 +181,7 @@ protected:
SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const Rectangle& rRect) const;
SAL_DLLPRIVATE void ImplSelect();
SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem );
- SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos );
+ SAL_DLLPRIVATE void ImplCallEventListeners( VclEventId nEvent, sal_uInt16 nPos );
DECL_DLLPRIVATE_LINK(ImplCallSelect, void*, void );
SAL_DLLPRIVATE void ImplFillLayoutData() const;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 9b930b3..2ab31c8 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -725,7 +725,7 @@ public:
@see ImplCallEventListeners(VclSimpleEvent* pEvent)
*/
- static void ImplCallEventListeners( sal_uLong nEvent, vcl::Window* pWin, void* pData );
+ static void ImplCallEventListeners( VclEventId nEvent, vcl::Window* pWin, void* pData );
/** Send event to all VCL application event listeners
@@ -743,7 +743,7 @@ public:
@see PostKeyEvent
*/
- static bool HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent );
+ static bool HandleKey( VclEventId nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent );
/** Send keypress event
@@ -753,7 +753,7 @@ public:
@see HandleKey
*/
- static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent );
+ static ImplSVEvent * PostKeyEvent( VclEventId nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent );
/** Send mouse event
@@ -761,7 +761,7 @@ public:
@param pWin Pointer to window to which the event is sent
@param pMouseEvent Mouse event to send
*/
- static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent );
+ static ImplSVEvent * PostMouseEvent( VclEventId nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent );
/** Remove mouse and keypress events from a window... any also zoom and scroll events
if the platform supports it.
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index a1c9a972..b152afc 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -35,174 +35,173 @@ namespace com { namespace sun { namespace star {
}
}}}
-#define VCLEVENT_OBJECT_DYING 1
-
+enum class VclEventId
+{
+ NONE = 0,
+ ObjectDying = 1,
// VclWindowEvent:
-#define VCLEVENT_WINDOW_CHILDCREATED 500 // pData = vcl::Window*
-#define VCLEVENT_WINDOW_CHILDDESTROYED 501 // pData = vcl::Window*
-#define VCLEVENT_WINDOW_PAINT 1000 // pData = Rectangle*
-#define VCLEVENT_WINDOW_MOVE 1001
-#define VCLEVENT_WINDOW_RESIZE 1002
-#define VCLEVENT_WINDOW_SHOW 1003
-#define VCLEVENT_WINDOW_HIDE 1004
-#define VCLEVENT_WINDOW_ACTIVATE 1005
-#define VCLEVENT_WINDOW_DEACTIVATE 1006 // pData = vcl::Window* = pPrevActiveWindow
-#define VCLEVENT_WINDOW_CLOSE 1007
-#define VCLEVENT_WINDOW_GETFOCUS 1008
-#define VCLEVENT_WINDOW_LOSEFOCUS 1009
-#define VCLEVENT_WINDOW_MINIMIZE 1010
-#define VCLEVENT_WINDOW_NORMALIZE 1011
-#define VCLEVENT_WINDOW_KEYINPUT 1012 // pData = KeyEvent*
-#define VCLEVENT_WINDOW_KEYUP 1013 // pData = KeyEvent*
-#define VCLEVENT_WINDOW_COMMAND 1014 // pData = CommandEvent*
-#define VCLEVENT_WINDOW_MOUSEMOVE 1015 // pData = MouseEvent*
-#define VCLEVENT_WINDOW_MOUSEBUTTONDOWN 1016 // pData = MouseEvent*
-#define VCLEVENT_WINDOW_MOUSEBUTTONUP 1017 // pData = MouseEvent*
-#define VCLEVENT_WINDOW_FRAMETITLECHANGED 1018 // pData = OUString* = oldTitle
-#define VCLEVENT_APPLICATION_DATACHANGED 1019 // pData = DataChangedEvent*
-#define VCLEVENT_WINDOW_ENABLED 1020
-#define VCLEVENT_WINDOW_DISABLED 1021
-#define VCLEVENT_WINDOW_DATACHANGED 1022 // pData = DataChangedEvent*
-#define VCLEVENT_WINDOW_ZOOM 1023 // pData = ZoomEvent*
-#define VCLEVENT_WINDOW_SCROLL 1024 // pData = ScrollEvent*
-
-// VclWindowEvent
-#define VCLEVENT_CONTROL_GETFOCUS 1100
-#define VCLEVENT_CONTROL_LOSEFOCUS 1101
-#define VCLEVENT_BUTTON_CLICK 1102
-#define VCLEVENT_PUSHBUTTON_TOGGLE 1103
-#define VCLEVENT_RADIOBUTTON_TOGGLE 1104
-#define VCLEVENT_CHECKBOX_TOGGLE 1105
-#define VCLEVENT_COMBOBOX_SELECT 1106
-#define VCLEVENT_COMBOBOX_DOUBLECLICK 1107
-#define VCLEVENT_LISTBOX_SELECT 1108
-#define VCLEVENT_LISTBOX_DOUBLECLICK 1109
-#define VCLEVENT_EDIT_MODIFY 1110
-#define VCLEVENT_SCROLLBAR_SCROLL 1111
-#define VCLEVENT_SCROLLBAR_ENDSCROLL 1112
-#define VCLEVENT_SPINBUTTON_UP 1113
-#define VCLEVENT_SPINBUTTON_DOWN 1114
-#define VCLEVENT_SPINFIELD_UP 1115
-#define VCLEVENT_SPINFIELD_DOWN 1116
-#define VCLEVENT_SPINFIELD_FIRST 1117
-#define VCLEVENT_SPINFIELD_LAST 1118
-#define VCLEVENT_STATUSBAR_CLICK 1119
-#define VCLEVENT_STATUSBAR_DOUBLECLICK 1120
-#define VCLEVENT_TOOLBOX_CLICK 1121
-#define VCLEVENT_TOOLBOX_DOUBLECLICK 1122
-#define VCLEVENT_TOOLBOX_ACTIVATE 1123
-#define VCLEVENT_TOOLBOX_DEACTIVATE 1124
-#define VCLEVENT_TOOLBOX_HIGHLIGHT 1125
-#define VCLEVENT_TOOLBOX_SELECT 1126
+ WindowChildCreated = 500, // pData = vcl::Window*
+ WindowChildDestroyed = 501, // pData = vcl::Window*
+ WindowPaint = 1000, // pData = Rectangle*
+ WindowMove = 1001,
+ WindowResize = 1002,
+ WindowShow = 1003,
+ WindowHide = 1004,
+ WindowActivate = 1005,
+ WindowDeactivate = 1006, // pData = vcl::Window* = pPrevActiveWindow
+ WindowClose = 1007,
+ WindowGetFocus = 1008,
+ WindowLoseFocus = 1009,
+ WindowMinimize = 1010,
+ WindowNormalize = 1011,
+ WindowKeyInput = 1012, // pData = KeyEvent*
+ WindowKeyUp = 1013, // pData = KeyEvent*
+ WindowCommand = 1014, // pData = CommandEvent*
+ WindowMouseMove = 1015, // pData = MouseEvent*
+ WindowMouseButtonDown = 1016, // pData = MouseEvent*
+ WindowMouseButtonUp = 1017, // pData = MouseEvent*
+ WindowFrameTitleChanged = 1018, // pData = OUString* = oldTitle
+ ApplicationDataChanged = 1019, // pData = DataChangedEvent*
+ WindowEnabled = 1020,
+ WindowDisabled = 1021,
+ WindowDataChanged = 1022, // pData = DataChangedEvent*
+ WindowZoom = 1023, // pData = ZoomEvent*
+ WindowScroll = 1024, // pData = ScrollEvent*
+ ControlGetFocus = 1100,
+ ControlLoseFocus = 1101,
+ ButtonClick = 1102,
+ PushbuttonToggle = 1103,
+ RadiobuttonToggle = 1104,
+ CheckboxToggle = 1105,
+ ComboboxSelect = 1106,
+ ComboboxDoubleClick = 1107,
+ ListboxSelect = 1108,
+ ListboxDoubleClick = 1109,
+ EditModify = 1110,
+ ScrollbarScroll = 1111,
+ ScrollbarEndScroll = 1112,
+ SpinbuttonUp = 1113,
+ SpinbuttonDown = 1114,
+ SpinfieldUp = 1115,
+ SpinfieldDown = 1116,
+ SpinfieldFirst = 1117,
+ SpinfieldLast = 1118,
+ StatusbarClick = 1119,
+ StatusbarDoubleClick = 1120,
+ ToolboxClick = 1121,
+ ToolboxDoubleClick = 1122,
+ ToolboxActivate = 1123,
+ ToolboxDeactivate = 1124,
+ ToolboxHighlight = 1125,
+ ToolboxSelect = 1126,
// Resort later...
-#define VCLEVENT_LISTBOX_SCROLLED 1127
-#define VCLEVENT_COMBOBOX_SCROLLED 1128
-#define VCLEVENT_EDIT_SELECTIONCHANGED 1129
-#define VCLEVENT_DROPDOWN_OPEN 1130
-#define VCLEVENT_DROPDOWN_CLOSE 1131
-
-#define VCLEVENT_TOOLBOX_ITEMADDED 1132 // pData = itempos
-#define VCLEVENT_TOOLBOX_ITEMREMOVED 1133 // pData = itempos
-#define VCLEVENT_TOOLBOX_ALLITEMSCHANGED 1134
-#define VCLEVENT_TOOLBOX_HIGHLIGHTOFF 1135 // pData = itempos
-#define VCLEVENT_WINDOW_MENUBARADDED 1136 // pData = pMenuBar
-#define VCLEVENT_TABPAGE_ACTIVATE 1137 // pData = pageid
-#define VCLEVENT_TABPAGE_DEACTIVATE 1138 // pData = pageid
+ ListboxScrolled = 1127,
+ ComboboxScrolled = 1128,
+ EditSelectionChanged = 1129,
+ DropdownOpen = 1130,
+ DropdownClose = 1131,
+ ToolboxItemAdded = 1132, // pData = itempos
+ ToolboxItemRemoved = 1133, // pData = itempos
+ ToolboxAllItemsChanged = 1134,
+ ToolboxHighlightOff = 1135, // pData = itempos
+ WindowMenubarAdded = 1136, // pData = pMenuBar
+ TabpageActivate = 1137, // pData = pageid
+ TabpageDeactivate = 1138, // pData = pageid
// free
// free
-#define VCLEVENT_TABBAR_PAGESELECTED 1141 // pData = pageid
-#define VCLEVENT_TABBAR_PAGEACTIVATED 1142 // pData = pageid
-#define VCLEVENT_TABBAR_PAGEDEACTIVATED 1143 // pData = pageid
-#define VCLEVENT_TABBAR_PAGEINSERTED 1144 // pData = pageid
-#define VCLEVENT_TABBAR_PAGEREMOVED 1145 // pData = pageid
-#define VCLEVENT_TABBAR_PAGEMOVED 1146 // pData = Pair( pagepos_old, pagepos_new )
-#define VCLEVENT_TABBAR_PAGETEXTCHANGED 1147 // pData = pageid
-#define VCLEVENT_COMBOBOX_DESELECT 1148
-#define VCLEVENT_TOOLBOX_ITEMTEXTCHANGED 1149 // pData = itempos
-#define VCLEVENT_TABPAGE_INSERTED 1150 // pData = pageid
-#define VCLEVENT_TABPAGE_REMOVED 1151 // pData = pageid
-#define VCLEVENT_TABPAGE_REMOVEDALL 1152
-#define VCLEVENT_LISTBOX_ITEMADDED 1153 // pData = itempos
-#define VCLEVENT_LISTBOX_ITEMREMOVED 1154 // pData = itempos, -1=ALL
-#define VCLEVENT_COMBOBOX_ITEMADDED 1155 // pData = itempos
-#define VCLEVENT_COMBOBOX_ITEMREMOVED 1156 // pData = itempos, -1=ALL
-// free 1157
-#define VCLEVENT_WINDOW_MENUBARREMOVED 1158 // pData = pMenuBar
-#define VCLEVENT_STATUSBAR_ITEMADDED 1159 // pData = itemid
-#define VCLEVENT_STATUSBAR_ITEMREMOVED 1160 // pData = itemid
-#define VCLEVENT_STATUSBAR_ALLITEMSREMOVED 1161
-#define VCLEVENT_STATUSBAR_SHOWITEM 1162 // pData = itemid
-#define VCLEVENT_STATUSBAR_HIDEITEM 1163 // pData = itemid
-#define VCLEVENT_STATUSBAR_SHOWALLITEMS 1164
+ TabbarPageSelected = 1141, // pData = pageid
+ TabbarPageActivated = 1142, // pData = pageid
+ TabbarPageDeactivated = 1143, // pData = pageid
+ TabbarPageInserted = 1144, // pData = pageid
+ TabbarPageRemoved = 1145, // pData = pageid
+ TabbarPageMoved = 1146, // pData = Pair( pagepos_old, pagepos_new )
+ TabbarPageTextChanged = 1147, // pData = pageid
+ ComboboxDeselect = 1148,
+ ToolboxItemTextChanged = 1149, // pData = itempos
+ TabpageInserted = 1150, // pData = pageid
+ TabpageRemoved = 1151, // pData = pageid
+ TabpageRemovedAll = 1152,
+ ListboxItemAdded = 1153, // pData = itempos
+ ListboxItemRemoved = 1154, // pData = itempos, -1=All
+ ComboboxItemAdded = 1155, // pData = itempos
+ ComboboxItemRemoved = 1156, // pData = itempos, -1=All
+//free
+ WindowMenubarRemoved = 1158, // pData = pMenuBar
+ StatusbarItemAdded = 1159, // pData = itemid
+ StatusbarItemRemoved = 1160, // pData = itemid
+ StatusbarAllItemsRemoved = 1161,
+ StatusbarShowItem = 1162, // pData = itemid
+ StatusbarHideItem = 1163, // pData = itemid
+ StatusbarShowAllItems = 1164,
// free
-#define VCLEVENT_STATUSBAR_DRAWITEM 1166 // pData = itemid
-#define VCLEVENT_STATUSBAR_NAMECHANGED 1167 // pData = itemid
-#define VCLEVENT_TOOLBOX_ITEMENABLED 1168 // pData = itempos
-#define VCLEVENT_TOOLBOX_ITEMDISABLED 1169 // pData = itempos
-#define VCLEVENT_TABPAGE_PAGETEXTCHANGED 1170 // pData = pageid
-#define VCLEVENT_ROADMAP_ITEMSELECTED 1171
-#define VCLEVENT_TOOLBOX_FORMATCHANGED 1172 // request new layout
-#define VCLEVENT_COMBOBOX_SETTEXT 1173
+ StatusbarDrawItem = 1166, // pData = itemid
+ StatusbarNameChanged = 1167, // pData = itemid
+ ToolboxItemEnabled = 1168, // pData = itempos
+ ToolboxItemDisabled = 1169, // pData = itempos
+ TabpagePageTextChanged = 1170, // pData = pageid
+ RoadmapItemSelected = 1171,
+ ToolboxFormatChanged = 1172, // request new layout
+ ComboboxSetText = 1173,
// #i92103#
-#define VCLEVENT_ITEM_EXPANDED 1174
-#define VCLEVENT_ITEM_COLLAPSED 1175
-#define VCLEVENT_DROPDOWN_PRE_OPEN 1176
-#define VCLEVENT_DROPDOWN_SELECT 1177
-#define VCLEVENT_LISTBOX_FOCUSITEMCHANGED 1180
+ ItemExpanded = 1174,
+ ItemCollapsed = 1175,
+ DropdownPreOpen = 1176,
+ DropdownSelect = 1177,
+ ListboxFocusItemChanged = 1180,
// VclMenuEvent
-#define VCLEVENT_MENU_ACTIVATE 1200
-#define VCLEVENT_MENU_DEACTIVATE 1201
-#define VCLEVENT_MENU_HIGHLIGHT 1202
-#define VCLEVENT_MENU_SELECT 1203
-#define VCLEVENT_MENU_ENABLE 1204
-#define VCLEVENT_MENU_INSERTITEM 1205
-#define VCLEVENT_MENU_REMOVEITEM 1206
-#define VCLEVENT_MENU_SUBMENUACTIVATE 1207
-#define VCLEVENT_MENU_SUBMENUDEACTIVATE 1208
-#define VCLEVENT_MENU_SUBMENUCHANGED 1209
-#define VCLEVENT_MENU_DEHIGHLIGHT 1210
-#define VCLEVENT_MENU_DISABLE 1211
-#define VCLEVENT_MENU_ITEMTEXTCHANGED 1212
-#define VCLEVENT_MENU_ITEMCHECKED 1213
-#define VCLEVENT_MENU_ITEMUNCHECKED 1214
-#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED 1215
-#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216
-#define VCLEVENT_TOOLBOX_ITEMUPDATED 1217
-
-#define VCLEVENT_MENU_SHOW 1250
-#define VCLEVENT_MENU_HIDE 1251
-
-#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216
-#define VCLEVENT_LISTBOX_TREEFOCUS 1220
-#define VCLEVENT_LISTBOX_TREESELECT 1221
-#define VCLEVENT_EDIT_CARETCHANGED 1222
-
-#define VCLEVENT_LISTBOX_FOCUS 1224
+ MenuActivate = 1200,
+ MenuDeactivate = 1201,
+ MenuHighlight = 1202,
+ MenuSelect = 1203,
+ MenuEnable = 1204,
+ MenuInsertItem = 1205,
+ MenuRemoveItem = 1206,
+ MenuSubmenuActivate = 1207,
+ MenuSubmenuDeactivate = 1208,
+ MenuSubmenuChanged = 1209,
+ MenuDehighlight = 1210,
+ MenuDisable = 1211,
+ MenuItemTextChanged = 1212,
+ MenuItemChecked = 1213,
+ MenuItemUnchecked = 1214,
+ MenuAccessibleNameChanged = 1215,
+ ToolboxItemWindowChanged = 1216,
+ ToolboxItemUpdated = 1217,
+
+ MenuShow = 1250,
+ MenuHide = 1251,
+
+ ListboxTreeFocus = 1220,
+ ListboxTreeSelect = 1221,
+ EditCaretChanged = 1222,
+
+ ListboxFocus = 1224,
// DockingWindow
-#define VCLEVENT_WINDOW_STARTDOCKING 1227 // pData = DockingData
-#define VCLEVENT_WINDOW_DOCKING 1228
-#define VCLEVENT_WINDOW_ENDDOCKING 1229 // pData = EndDockingData
-#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING 1230 // pData = bool
-#define VCLEVENT_WINDOW_TOGGLEFLOATING 1231
-#define VCLEVENT_WINDOW_ENDPOPUPMODE 1232 // pData = EndPopupModeData
-
-#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1233 // pData = itempos
-#define VCLEVENT_TABLECELL_NAMECHANGED 1234 // pData = struct(Entry, Column, oldText)
-#define VCLEVENT_TABLEROW_SELECT 1235
-#define VCLEVENT_LISTBOX_STATEUPDATE 1236
+ WindowStartDocking = 1227, // pData = DockingData
+ WindowDocking = 1228,
+ WindowEndDocking = 1229, // pData = EndDockingData
+ WindowPrepareToggleFloating = 1230, // pData = bool
+ WindowToggleFloating = 1231,
+ WindowEndPopupMode = 1232, // pData = EndPopupModeData
+
+ ToolboxButtonStateChanged = 1233, // pData = itempos
+ TableCellNameChanged = 1234, // pData = struct(Entry, Column, oldText)
+ TableRowSelect = 1235,
+ ListboxStateUpdate = 1236,
+};
class VCL_DLLPUBLIC VclSimpleEvent
{
private:
- sal_uLong nId;
+ VclEventId nId;
public:
- VclSimpleEvent( sal_uLong n ) { nId = n; }
+ VclSimpleEvent( VclEventId n ) { nId = n; }
virtual ~VclSimpleEvent() {}
- sal_uLong GetId() const { return nId; }
+ VclEventId GetId() const { return nId; }
};
class VCL_DLLPUBLIC VclWindowEvent : public VclSimpleEvent
@@ -212,7 +211,7 @@ private:
void* pData;
public:
- VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat );
+ VclWindowEvent( vcl::Window* pWin, VclEventId n, void* pDat );
virtual ~VclWindowEvent() override;
vcl::Window* GetWindow() const { return pWindow; }
@@ -229,7 +228,7 @@ private:
void operator =(VclMenuEvent) = delete;
public:
- VclMenuEvent( Menu* pM, sal_uLong n, sal_uInt16 nPos );
+ VclMenuEvent( Menu* pM, VclEventId n, sal_uInt16 nPos );
virtual ~VclMenuEvent() override;
Menu* GetMenu() const;
@@ -239,7 +238,7 @@ public:
class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent
{
public:
- VclAccessibleEvent( sal_uLong n, const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible );
+ VclAccessibleEvent( VclEventId n, const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible );
virtual ~VclAccessibleEvent() override;
const css::uno::Reference< css::accessibility::XAccessible >& GetAccessible() const { return mxAccessible;}
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d5713ad..8aa141e 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -69,6 +69,7 @@ class MenuFloatingWindow;
class VCLXWindow;
class VclWindowEvent;
enum class ImplPaintFlags;
+enum class VclEventId;
namespace com { namespace sun { namespace star {
namespace accessibility {
@@ -749,7 +750,7 @@ protected:
void SetCompoundControl( bool bCompound );
- void CallEventListeners( sal_uLong nEvent, void* pData = nullptr );
+ void CallEventListeners( VclEventId nEvent, void* pData = nullptr );
static void FireVclEvent( VclSimpleEvent& rEvent );
virtual bool AcquireGraphics() const override;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index c4395fc..9fdb931 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2566,7 +2566,7 @@ sal_Int32 OReportController::getGroupPosition(const uno::Reference< report::XGro
IMPL_LINK( OReportController, EventLstHdl, VclWindowEvent&, _rEvent, void )
{
- if ( _rEvent.GetId() == VCLEVENT_WINDOW_CLOSE )
+ if ( _rEvent.GetId() == VclEventId::WindowClose )
{
InvalidateFeature(SID_SORTINGANDGROUPING);
InvalidateFeature(SID_FM_ADD_FIELD);
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 9b0677e..0fd26d4 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -82,9 +82,9 @@ public:
IMPL_LINK(OXReportControllerObserver, SettingsChanged, VclSimpleEvent&, _rEvt, void)
{
- sal_Int32 nEvent = _rEvt.GetId();
+ VclEventId nEvent = _rEvt.GetId();
- if (nEvent == VCLEVENT_APPLICATION_DATACHANGED )
+ if (nEvent == VclEventId::ApplicationDataChanged )
{
DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(_rEvt).GetData());
if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) ||
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f919af43..6b57a08 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1480,7 +1480,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve
OSL_ENSURE( rEvent.GetWindow(), "Window???" );
switch ( rEvent.GetId() )
{
- case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children
+ case VclEventId::WindowShow: // send create on show for direct accessible children
{
vcl::Window* pChildWin = static_cast < vcl::Window * >( rEvent.GetData() );
if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() )
@@ -1489,7 +1489,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve
}
}
break;
- case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children
+ case VclEventId::WindowHide: // send destroy on hide for direct accessible children
{
vcl::Window* pChildWin = static_cast < vcl::Window * >( rEvent.GetData() );
if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() )
@@ -1498,6 +1498,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve
}
}
break;
+ default: break;
}
}
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 5d1fa76..33ec656 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -857,13 +857,13 @@ void ScInputHandler::GetFormulaData()
IMPL_LINK( ScInputHandler, ShowHideTipVisibleParentListener, VclWindowEvent&, rEvent, void )
{
- if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE )
+ if( rEvent.GetId() == VclEventId::ObjectDying || rEvent.GetId() == VclEventId::WindowHide )
HideTip();
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list