[Libreoffice-commits] core.git: include/sfx2 include/svx include/vcl svx/source vcl/source

[Stephan Bergmann]

 include/sfx2/sfx.hrc            |    4 ----
 include/svx/svxids.hrc          |    7 -------
 include/vcl/svapp.hxx           |    8 --------
 include/vcl/window.hxx          |    1 -
 svx/source/tbxctrls/layctrl.cxx |    8 --------
 vcl/source/app/svapp.cxx        |    4 ----
 vcl/source/window/window.cxx    |    4 ----
 7 files changed, 36 deletions(-)

New commits:
commit f4d3558334c5b403c2f1298f2ef831607778dae5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 6 14:25:46 2014 +0200

    Application::UserEvent and Window::UserEvent are empty
    
    ...and never overridden, so can be removed along with the dead
    SVX_EVENT_COLUM_WINDOW_EXECUTE code that calls them.
    
    Change-Id: Ie500066c083f8fbf649c64f2d61fb85901473b5c

diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index b8ccfa4..ad533aa 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -38,10 +38,6 @@
 #define EVENT_APP_START             20000
 //      EVENT_APP_END               29999
 
-#define EVENT_OBJ_START             30000
-
-#define EVENT_SVX_START             (EVENT_OBJ_START+0x0400)
-
 // Warning: the following are simultaneously SID_ON_ ...
 #define SFX_EVENT_CLOSEAPP          (EVENT_SFX_START + 1)
 #define SFX_EVENT_CREATEDOC         (EVENT_SFX_START + 2)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 0bd819f..ec38491 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -88,13 +88,6 @@
 #define MID_ZOOMSLIDER_MINZOOM          0x7b
 #define MID_ZOOMSLIDER_MAXZOOM          0x7c
 
-
-// Event-Id's Block 1
-
-
-#define SVX_EVENT_COLUM_WINDOW_EXECUTE      (EVENT_SVX_START)
-
-
 // Event-Id's Block 2
 
 
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 1b8f6e1..7f330f5 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -350,14 +350,6 @@ public:
     */
     virtual bool           QueryExit();
 
-    /** Send user event.
-
-    @param  nEvent      The numeric ID of the event
-    @param  pEventData  Pointer to a data associated with the event. Use
-                        a reinterpret_cast<void*> to pass in the parameter.
-    */
-    virtual void                UserEvent( sal_uLong nEvent, void* pEventData );
-
     /** @name Change Notification Functions
 
         Functions that notify when changes occur in the application.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 001dfd5..5dc7340 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -695,7 +695,6 @@ public:
     virtual void        RequestHelp( const HelpEvent& rHEvt );
     virtual void        Command( const CommandEvent& rCEvt );
     virtual void        Tracking( const TrackingEvent& rTEvt );
-    virtual void        UserEvent( sal_uLong nEvent, void* pEventData );
     virtual void        StateChanged( StateChangedType nStateChange );
     virtual void        DataChanged( const DataChangedEvent& rDCEvt );
     virtual bool        PreNotify( NotifyEvent& rNEvt );
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index e0fcd32..051adbb 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -373,10 +373,6 @@ void TableWindow::Update( long nNewCol, long nNewLine )
 
 void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs )
 {
-    Window* pParent = rTbx.GetParent();
-    sal_uInt16 nId = GetId();
-    pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
-
     Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY );
     if ( xDispatchProvider.is() )
     {
@@ -693,10 +689,6 @@ void ColumnsWindow::PopupModeEnd()
 {
     if ( !IsPopupModeCanceled() && nCol )
     {
-        sal_uInt16 nId = GetId();
-        Window* pParent = rTbx.GetParent();
-        pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
-
         Sequence< PropertyValue > aArgs( 2 );
         aArgs[0].Name = "Columns";
         aArgs[0].Value = makeAny( sal_Int16( nCol ));
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index ba2c51f..4c8a254 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -219,10 +219,6 @@ bool Application::QueryExit()
         return true;
 }
 
-void Application::UserEvent( sal_uLong, void* )
-{
-}
-
 void Application::FocusChanged()
 {
 }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 2b155e9..d329a92 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4945,10 +4945,6 @@ void Window::Tracking( const TrackingEvent& rTEvt )
         pWrapper->Tracking( rTEvt );
 }
 
-void Window::UserEvent( sal_uLong, void* )
-{
-}
-
 void Window::StateChanged( StateChangedType eType )
 {
     switch (eType)