Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui

Conflicts:
	vcl/source/control/makefile.mk
	vcl/unx/generic/printer/ppdparser.cxx

2 files changed, 2 insertions, 5 deletions

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index cd488833782a..6a303eee1ef0 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -340,11 +340,7 @@ static ComponentInfo aComponentInfos [] =
 
 extern "C"
 {
-static int
-#if defined( WNT )
- __cdecl
-#endif
-     ComponentInfoCompare( const void* pFirst, const void* pSecond)
+static int SAL_CALL ComponentInfoCompare( const void* pFirst, const void* pSecond)
 {
     return( strcmp( ((ComponentInfo*)pFirst)->pName,
                     ((ComponentInfo*)pSecond)->pName ) );
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 4db3a3fde38e..def82b41ee9b 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -259,6 +259,7 @@ void VCLXWindowImpl::disposing()
     ::com::sun::star::lang::EventObject aEvent;
     aEvent.Source = mrAntiImpl;
 
+    maDockableWindowListeners.disposeAndClear( aEvent );
     maEventListeners.disposeAndClear( aEvent );
     maFocusListeners.disposeAndClear( aEvent );
     maWindowListeners.disposeAndClear( aEvent );