[Libreoffice-commits] core.git: 2 commits - include/vcl toolkit/source

[Tor Lillqvist]

 include/vcl/window.hxx               |    7 -------
 toolkit/source/helper/unowrapper.cxx |   32 --------------------------------
 2 files changed, 39 deletions(-)

New commits:
commit dcdf3cd1983b673eb1ed1a5c23b68ba46fe4dd1b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Dec 13 11:12:43 2013 +0200

    Bin unused or duplicate forward class declarations
    
    Change-Id: Ic6fbb345e333d67f967a3ea09a5a90ecef910040

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8593fb0..fc7e2e0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -42,13 +42,11 @@
 class VirtualDevice;
 struct ImplDelData;
 struct ImplWinData;
-struct ImplOverlapData;
 struct ImplFrameData;
 struct ImplCalcToTopData;
 struct SystemEnvData;
 struct SystemParentData;
 class ImplBorderWindow;
-class VirtualDevice;
 class Timer;
 class Cursor;
 class DockingManager;
@@ -65,12 +63,8 @@ class DataChangedEvent;
 class NotifyEvent;
 class SystemWindow;
 class SalFrame;
-class SalObject;
 class MenuFloatingWindow;
-// Nur fuer ExecuteDrag:
-struct IDataObject;
 class VCLXWindow;
-struct ImplAccessibleInfos;
 
 namespace com {
 namespace sun {
commit b677fa9d4886d94d9b6d12e091c159655deb2d3f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Dec 13 11:00:43 2013 +0200

    UNOWindowData has been dead since the year 2000 at least
    
    Change-Id: I8d3079f5b508008a4c25a4baa604fc89c81aab33

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index a8d6883..8593fb0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -67,7 +67,6 @@ class SystemWindow;
 class SalFrame;
 class SalObject;
 class MenuFloatingWindow;
-class UNOWindowData;
 // Nur fuer ExecuteDrag:
 struct IDataObject;
 class VCLXWindow;
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index c317e6f..84d87e4 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -205,38 +205,6 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev )
 
 }
 
-// It was once called in the Window-CTOR to make listeners of the Container
-// to react. This didn't really work, as the interface within the Window-CTOR
-// was not ready.
-// => Call only the listener, when created through ::com::sun::star::awt::Toolkit
-
-/*
-void ImplSmartWindowCreated( Window* pNewWindow )
-{
-    UNOWindowData* pParentUNOData = pNewWindow->GetParent() ?
-                            pNewWindow->GetParent()->GetUNOData() : NULL;
-
-    if ( pParentUNOData && pParentUNOData->GetListeners( EL_CONTAINER ) )
-    {
-        UNOWindowData* pUNOData = pNewWindow->GetUNOData();
-        if ( !pUNOData )
-            pUNOData = ImplSmartCreateUNOData( pNewWindow );
-
-        ::com::sun::star::awt::VclContainerEvent aEvent;
-        aEvent.Source = (UsrObject*)pParentUNOData->GetWindowPeer();
-        aEvent.Id = VCLCOMPONENT_ADDED;
-        aEvent.Child = (UsrObject*)pUNOData->GetWindowPeer();
-
-        EventList* pLst = pParentUNOData->GetListeners( EL_CONTAINER );
-        for ( sal_uInt32 n = 0; n < pLst->Count(); n++ )
-        {
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > * pRef = pLst->GetObject( n );
-            ((::com::sun::star::awt::XVclContainerListener*)(::com::sun::star::lang::XEventListener*)*pRef)->windowAdded( aEvent );
-        }
-    }
-}
-*/
-
 static sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild )
 {
     Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL;