Remove VCLExternalSolarLock and IMutex.

Next step is to remove OContextEntryGuard.

Change-Id: I9460fb67fba6f3bfb3c809b730c33f38d225a64e
Reviewed-on: https://gerrit.libreoffice.org/38411
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 2 insertions, 50 deletions

diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index e29520198bef..f37c95c1d593 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -30,7 +30,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/accimplaccess.hxx>
 #include <comphelper/accessiblecomponenthelper.hxx>
-#include <toolkit/helper/externallock.hxx>
 
 
 #include <tools/link.hxx>
@@ -53,8 +52,7 @@ typedef ::cppu::ImplHelper1<
     css::lang::XServiceInfo > VCLXAccessibleComponent_BASE;
 
 class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
-        :private BaseVCLExternalSolarLock
-        ,public comphelper::OAccessibleExtendedComponentHelper
+        :public comphelper::OAccessibleExtendedComponentHelper
         ,public ::comphelper::OAccessibleImplementationAccess
         ,public VCLXAccessibleComponent_BASE
 {
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index 7642433642ee..cbd304a1334d 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <vcl/vclptr.hxx>
-#include <toolkit/helper/externallock.hxx>
 
 namespace vcl { class Window; }
 
@@ -49,8 +48,7 @@ namespace toolkit
         is being disposed.</p>
     */
     class OAccessibleControlContext
-            :private BaseVCLExternalSolarLock
-            ,public ::comphelper::OAccessibleImplementationAccess
+            :public ::comphelper::OAccessibleImplementationAccess
             ,public OAccessibleControlContext_Base
             ,public OAccessibleControlContext_IBase
     {
diff --git a/include/toolkit/helper/externallock.hxx b/include/toolkit/helper/externallock.hxx
deleted file mode 100644
index ddac625e73bf..000000000000
--- a/include/toolkit/helper/externallock.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
-#define INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
-
-#include <toolkit/dllapi.h>
-#include <comphelper/accessiblecontexthelper.hxx>
-
-
-//  class VCLExternalSolarLock
-
-
-class TOOLKIT_DLLPUBLIC VCLExternalSolarLock : public ::comphelper::IMutex
-{
-public:
-    virtual void acquire() override;
-    virtual void release() override;
-};
-
-class BaseVCLExternalSolarLock
-{
-protected:
-    mutable VCLExternalSolarLock m_aLock;
-};
-
-#endif // INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */