From a7532d8f061986c2e828df32f47f1fee1a339a14 Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.versini@gmail.com>
Date: Mon, 5 Jun 2017 16:12:27 +0200
Subject: 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>
---
 accessibility/inc/extended/accessibletabbarbase.hxx        | 5 +----
 accessibility/inc/pch/precompiled_acc.hxx                  | 1 -
 accessibility/inc/standard/accessiblemenubasecomponent.hxx | 4 +---
 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx | 4 +---
 accessibility/inc/standard/vclxaccessibletabpage.hxx       | 4 +---
 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx   | 4 +---
 6 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'accessibility/inc')

diff --git a/accessibility/inc/extended/accessibletabbarbase.hxx b/accessibility/inc/extended/accessibletabbarbase.hxx
index d2d6ab83cc3c..8fd28dc06beb 100644
--- a/accessibility/inc/extended/accessibletabbarbase.hxx
+++ b/accessibility/inc/extended/accessibletabbarbase.hxx
@@ -23,10 +23,8 @@
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
-#include <toolkit/helper/externallock.hxx>
 
 class TabBar;
-class VCLExternalSolarLock;
 class VclSimpleEvent;
 class VclWindowEvent;
 
@@ -34,8 +32,7 @@ class VclWindowEvent;
 namespace accessibility
 {
 
-class AccessibleTabBarBase : private BaseVCLExternalSolarLock,
-                             public comphelper::OAccessibleExtendedComponentHelper
+class AccessibleTabBarBase : public comphelper::OAccessibleExtendedComponentHelper
 {
 public:
     explicit            AccessibleTabBarBase( TabBar* pTabBar );
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index a6a92876ada5..bebb30a6b92e 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -303,7 +303,6 @@
 #include <toolkit/awt/vclxwindows.hxx>
 #include <toolkit/dllapi.h>
 #include <toolkit/helper/convert.hxx>
-#include <toolkit/helper/externallock.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index 96fa054244c2..2447b0d6c1d3 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -27,7 +27,6 @@
 #include <cppuhelper/implbase2.hxx>
 #include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
-#include <toolkit/helper/externallock.hxx>
 
 #include <vector>
 
@@ -46,8 +45,7 @@ typedef ::cppu::ImplHelper2<
     css::accessibility::XAccessible,
     css::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE;
 
-class OAccessibleMenuBaseComponent : private BaseVCLExternalSolarLock,
-                                     public comphelper::OAccessibleExtendedComponentHelper,
+class OAccessibleMenuBaseComponent : public comphelper::OAccessibleExtendedComponentHelper,
                                      public OAccessibleMenuBaseComponent_BASE
 {
     friend class OAccessibleMenuItemComponent;
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index 163fd663f5b6..47cb8bad700a 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -25,7 +25,6 @@
 #include <comphelper/accessibletexthelper.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <vcl/vclptr.hxx>
-#include <toolkit/helper/externallock.hxx>
 
 class StatusBar;
 
@@ -43,8 +42,7 @@ typedef ::cppu::ImplHelper2<
     css::accessibility::XAccessible,
     css::lang::XServiceInfo > VCLXAccessibleStatusBarItem_BASE;
 
-class VCLXAccessibleStatusBarItem : private BaseVCLExternalSolarLock,
-                                    public AccessibleTextHelper_BASE,
+class VCLXAccessibleStatusBarItem : public AccessibleTextHelper_BASE,
                                     public VCLXAccessibleStatusBarItem_BASE
 {
     friend class VCLXAccessibleStatusBar;
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx
index 830e45d64808..66a2fbc8f87d 100644
--- a/accessibility/inc/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx
@@ -25,7 +25,6 @@
 #include <comphelper/accessibletexthelper.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <vcl/vclptr.hxx>
-#include <toolkit/helper/externallock.hxx>
 
 
 class TabControl;
@@ -44,8 +43,7 @@ typedef ::cppu::ImplHelper2<
     css::accessibility::XAccessible,
     css::lang::XServiceInfo > VCLXAccessibleTabPage_BASE;
 
-class VCLXAccessibleTabPage :   private BaseVCLExternalSolarLock,
-                                public AccessibleTextHelper_BASE,
+class VCLXAccessibleTabPage :   public AccessibleTextHelper_BASE,
                                 public VCLXAccessibleTabPage_BASE
 {
     friend class VCLXAccessibleTabControl;
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 47bb3c387e93..fd455b025507 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -31,7 +31,6 @@
 #include <cppuhelper/implbase4.hxx>
 #include <comphelper/accessibletexthelper.hxx>
 #include <vcl/vclptr.hxx>
-#include <toolkit/helper/externallock.hxx>
 
 
 class ToolBox;
@@ -42,8 +41,7 @@ typedef ::cppu::ImplHelper4 < css::accessibility::XAccessible,
                               css::accessibility::XAccessibleValue,
                               css::lang::XServiceInfo > VCLXAccessibleToolBoxItem_BASE;
 
-class VCLXAccessibleToolBoxItem : private BaseVCLExternalSolarLock,
-                                  public AccessibleTextHelper_BASE,
+class VCLXAccessibleToolBoxItem : public AccessibleTextHelper_BASE,
                                   public VCLXAccessibleToolBoxItem_BASE
 {
 private:
-- 
cgit