Merge commit 'ooo/OOO330_m9'

Conflicts:
	toolkit/source/awt/vclxwindow.cxx

3 files changed, 1 insertions, 65 deletions

diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx
index d0baff3b8343..9836b8fd6631 100644
--- a/toolkit/inc/pch/precompiled_toolkit.hxx
+++ b/toolkit/inc/pch/precompiled_toolkit.hxx
@@ -292,7 +292,6 @@
 #include "toolkit/helper/mutexhelper.hxx"
 #include "toolkit/helper/property.hxx"
 #include "toolkit/helper/servicenames.hxx"
-#include "toolkit/helper/solarrelease.hxx"
 #include "toolkit/helper/tkresmgr.hxx"
 #include "toolkit/helper/unomemorystream.hxx"
 #include "toolkit/helper/unopropertyarrayhelper.hxx"
diff --git a/toolkit/inc/toolkit/helper/solarrelease.hxx b/toolkit/inc/toolkit/helper/solarrelease.hxx
deleted file mode 100644
index d8938b41c220..000000000000
--- a/toolkit/inc/toolkit/helper/solarrelease.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef TOOLKIT_INC_TOOLKIT_HELPER_SOLARRELEASE_HXX
-#define TOOLKIT_INC_TOOLKIT_HELPER_SOLARRELEASE_HXX
-
-#include <vcl/svapp.hxx>
-
-//........................................................................
-namespace toolkit
-{
-//........................................................................
-
-    //====================================================================
-    //= ReleaseSolarMutex
-    //====================================================================
-    class ReleaseSolarMutex
-    {
-        sal_uInt32  mnLockCount;
-    public:
-        ReleaseSolarMutex()
-        {
-            mnLockCount = Application::ReleaseSolarMutex();
-        }
-
-        ~ReleaseSolarMutex()
-        {
-            Application::AcquireSolarMutex( mnLockCount );
-        }
-    };
-
-//........................................................................
-} // namespace toolkit
-//........................................................................
-
-#endif // TOOLKIT_INC_TOOLKIT_HELPER_SOLARRELEASE_HXX
-
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 3e798c3f0ecd..b3f5a30abeda 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -65,7 +65,6 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/button.hxx>
 #include <comphelper/asyncnotification.hxx>
-#include <toolkit/helper/solarrelease.hxx>
 #include "stylesettings.hxx"
 
 #include <toolkit/helper/unopropertyarrayhelper.hxx>
@@ -92,7 +91,6 @@ using ::com::sun::star::style::VerticalAlignment_MAKE_FIXED_SIZE;
 namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
 namespace MouseWheelBehavior = ::com::sun::star::awt::MouseWheelBehavior;
 
-
 //====================================================================
 //= misc helpers
 //====================================================================
@@ -339,7 +337,7 @@ IMPL_LINK( VCLXWindowImpl, OnProcessCallbacks, void*, EMPTYARG )
     }
 
     {
-        SolarMutexReleaser aReleaseSolar;
+        SolarMutexReleaser aReleaseSolar( SolarMutexReleaser::RescheduleDuringAcquire );
         for (   CallbackArray::const_iterator loop = aCallbacksCopy.begin();
                 loop != aCallbacksCopy.end();
                 ++loop