[Libreoffice-commits] core.git: Branch 'feature/priorities' - sfx2/source vcl/osx vcl/win

Tobias Madl tobias.madl.dev at gmail.com
Fri Nov 28 00:49:46 PST 2014


 sfx2/source/sidebar/PopupContainer.cxx |    2 +-
 vcl/osx/salinst.cxx                    |    2 +-
 vcl/win/source/window/salframe.cxx     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 597e83407d9e91daed61cb6dfea167ae8c4a9ad1
Author: Tobias Madl <tobias.madl.dev at gmail.com>
Date:   Wed Nov 26 14:53:25 2014 +0000

    fdo#84938: replace EVENT_ constants with enum
    
    Change-Id: I8275832d8dae43b374bddd48520d11592e9a6a1f

diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx
index 97566fb..92e5e20 100644
--- a/sfx2/source/sidebar/PopupContainer.cxx
+++ b/sfx2/source/sidebar/PopupContainer.cxx
@@ -39,7 +39,7 @@ PopupContainer::~PopupContainer (void)
 
 long  PopupContainer::Notify (NotifyEvent& rEvent)
 {
-    if (rEvent.GetType() == EVENT_LOSEFOCUS)
+    if (rEvent.GetType() == MouseNotifyEvent::LOSEFOCUS)
     {
         if( ! HasChildPathFocus(sal_True))
             EndPopupMode();
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 5e81c6b..26ff137 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -521,7 +521,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
         {
             const Point aPoint;
             CommandEvent aCEvt( aPoint, COMMAND_MEDIA, FALSE, &nCommand );
-            NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
+            NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt );
 
             if ( !ImplCallPreNotify( aNCmdEvt ) )
                 pWindow->Command( aCEvt );
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index d2fef8f..c8f5f3f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5214,7 +5214,7 @@ static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam )
     {
         const Point aPoint;
         CommandEvent aCEvt( aPoint, COMMAND_MEDIA, FALSE, &nCommand );
-        NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
+        NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt );
 
         if ( !ImplCallPreNotify( aNCmdEvt ) )
         {


More information about the Libreoffice-commits mailing list