summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/dialog/imapwnd.cxx2
-rw-r--r--svx/source/dialog/svxruler.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/form/filtnav.cxx6
-rw-r--r--svx/source/form/navigatortree.cxx6
-rw-r--r--svx/source/gallery2/galbrws1.cxx2
-rw-r--r--svx/source/gallery2/galctrl.cxx8
-rw-r--r--svx/source/stbctrls/pszctrl.cxx2
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx2
-rw-r--r--svx/source/stbctrls/zoomctrl.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx4
12 files changed, 23 insertions, 19 deletions
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 3ae813705a88..43304c434fb1 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -474,7 +474,7 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
{
vcl::Region aRegion;
- if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
+ if ( rCEvt.GetCommand() == CommandEventId::ContextMenu )
{
PopupMenu aMenu( SVX_RES( RID_SVXMN_IMAP ) );
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 87aa43c483f2..5f3f1b4b216b 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3453,7 +3453,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
void SvxRuler::Command( const CommandEvent& rCommandEvent )
{
/* Mouse context menu for switching the unit of measurement */
- if ( COMMAND_CONTEXTMENU == rCommandEvent.GetCommand() )
+ if ( CommandEventId::ContextMenu == rCommandEvent.GetCommand() )
{
CancelDrag();
bool bRTL = mxRulerImpl->pTextRTLItem && mxRulerImpl->pTextRTLItem->GetValue();
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 056582910ef0..71290f056130 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -993,7 +993,7 @@ void FmGridHeader::Command(const CommandEvent& rEvt)
{
switch (rEvt.GetCommand())
{
- case COMMAND_CONTEXTMENU:
+ case CommandEventId::ContextMenu:
{
if (!rEvt.IsMouseEvent())
return;
@@ -1023,7 +1023,7 @@ FmGridControl::FmGridControl(
void FmGridControl::Command(const CommandEvent& _rEvt)
{
- if ( COMMAND_CONTEXTMENU == _rEvt.GetCommand() )
+ if ( CommandEventId::ContextMenu == _rEvt.GetCommand() )
{
FmGridHeader* pMyHeader = static_cast< FmGridHeader* >( GetHeaderBar() );
if ( pMyHeader && !_rEvt.IsMouseEvent() )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index da23bfd34dad..7c9b026afb3d 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2794,7 +2794,7 @@ void DbGridControl::Command(const CommandEvent& rEvt)
{
switch (rEvt.GetCommand())
{
- case COMMAND_CONTEXTMENU:
+ case CommandEventId::ContextMenu:
{
if ( !m_pSeekCursor )
{
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 906a6ffec33c..405cae05229a 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1614,7 +1614,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
bool bHandled = false;
switch (rEvt.GetCommand())
{
- case COMMAND_CONTEXTMENU:
+ case CommandEventId::ContextMenu:
{
// die Stelle, an der geklickt wurde
Point aWhere;
@@ -1704,7 +1704,9 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
} break;
}
bHandled = true;
- } break;
+ }
+ break;
+ default: break;
}
if (!bHandled)
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 7da894363cbf..9003b2577f39 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -312,7 +312,7 @@ namespace svxform
bool bHandled = false;
switch( rEvt.GetCommand() )
{
- case COMMAND_CONTEXTMENU:
+ case CommandEventId::ContextMenu:
{
// Position of click
::Point ptWhere;
@@ -526,7 +526,9 @@ namespace svxform
}
}
bHandled = true;
- } break;
+ }
+ break;
+ default: break;
}
if (!bHandled)
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index d3c9e3026c75..854ce84c2f3b 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -88,7 +88,7 @@ bool GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt )
{
const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
- if( pCEvt && pCEvt->GetCommand() == COMMAND_CONTEXTMENU )
+ if( pCEvt && pCEvt->GetCommand() == CommandEventId::ContextMenu )
static_cast< GalleryBrowser1* >( GetParent() )->ShowContextMenu();
}
else if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index a9bc30215615..90e0f1a069c7 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -157,7 +157,7 @@ void GalleryPreview::Command(const CommandEvent& rCEvt )
{
Window::Command( rCEvt );
- if( mpTheme && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) )
+ if( mpTheme && ( rCEvt.GetCommand() == CommandEventId::ContextMenu ) )
static_cast<GalleryBrowser2*>( GetParent() )->ShowContextMenu( this,
( rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : NULL ) );
}
@@ -378,7 +378,7 @@ void GalleryIconView::Command( const CommandEvent& rCEvt )
{
ValueSet::Command( rCEvt );
- if( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
+ if( rCEvt.GetCommand() == CommandEventId::ContextMenu )
{
static_cast<GalleryBrowser2*>( GetParent() )->ShowContextMenu( this,
( rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : NULL ) );
@@ -403,7 +403,7 @@ sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt )
void GalleryIconView::StartDrag( sal_Int8, const Point& )
{
- const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, true );
+ const CommandEvent aEvt( GetPointerPosPixel(), CommandEventId::StartDrag, true );
vcl::Region aRegion;
// call this to initiate dragging for ValueSet
@@ -558,7 +558,7 @@ void GalleryListView::Command( const CommandEvent& rCEvt )
{
BrowseBox::Command( rCEvt );
- if( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
+ if( rCEvt.GetCommand() == CommandEventId::ContextMenu )
{
const Point* pPos = NULL;
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index e102a7f96455..d4acca719c07 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -310,7 +310,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt )
{
- if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && pImp->bHasMenu )
+ if ( rCEvt.GetCommand() == CommandEventId::ContextMenu && pImp->bHasMenu )
{
sal_uInt16 nSelect = pImp->nFunction;
if (!nSelect)
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 8ae7cb8a8a19..325bb00c7f54 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -119,7 +119,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons
void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
{
- if( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
+ if( rCEvt.GetCommand() == CommandEventId::ContextMenu )
{
PopupMenu aPopupMenu( ResId( RID_SVXMNU_XMLSECSTATBAR, DIALOG_MGR() ) );
if( aPopupMenu.Execute( &GetStatusBar(), rCEvt.GetMousePosPixel() ) )
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index d5b9ad351acc..bbec9029fd85 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -142,7 +142,7 @@ void SvxZoomStatusBarControl::Paint( const UserDrawEvent& )
void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
{
- if ( COMMAND_CONTEXTMENU & rCEvt.GetCommand() && bool(nValueSet) )
+ if ( CommandEventId::ContextMenu == rCEvt.GetCommand() && bool(nValueSet) )
{
ZoomPopup_Impl aPop( nZoom, nValueSet );
StatusBar& rStatusbar = GetStatusBar();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 6c116cf58709..b2712615e1f9 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1317,10 +1317,10 @@ bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin)
{
- // as long as OutlinerView returns a sal_Bool, it only gets COMMAND_STARTDRAG
+ // as long as OutlinerView returns a sal_Bool, it only gets CommandEventId::StartDrag
if (pTextEditOutlinerView!=NULL)
{
- if (rCEvt.GetCommand()==COMMAND_STARTDRAG) {
+ if (rCEvt.GetCommand()==CommandEventId::StartDrag) {
bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
if (!bPostIt && rCEvt.IsMouseEvent()) {
Point aPt(rCEvt.GetMousePosPixel());
generated by cgit (git 2.34.1) at 2025-05-10 13:30:16 +0000