From a7532d8f061986c2e828df32f47f1fee1a339a14 Mon Sep 17 00:00:00 2001 From: Arnaud Versini 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 Reviewed-by: Noel Grandin --- toolkit/Library_tk.mk | 1 - toolkit/source/awt/vclxaccessiblecomponent.cxx | 2 -- .../source/controls/accessiblecontrolcontext.cxx | 1 - toolkit/source/helper/externallock.cxx | 37 ---------------------- 4 files changed, 41 deletions(-) delete mode 100644 toolkit/source/helper/externallock.cxx (limited to 'toolkit') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 3aea70643362..94e08a8dee74 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -109,7 +109,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/controls/unocontrolmodel \ toolkit/source/controls/unocontrols \ toolkit/source/helper/accessibilityclient \ - toolkit/source/helper/externallock \ toolkit/source/helper/formpdfexport \ toolkit/source/helper/imagealign \ toolkit/source/helper/listenermultiplexer \ diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index ae971faeaffe..40a40d2dddcd 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -43,8 +43,6 @@ using namespace ::com::sun::star; using namespace ::comphelper; VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXWindow ) - : OAccessibleExtendedComponentHelper( &m_aLock ) - , OAccessibleImplementationAccess( ) { m_xVCLXWindow = pVCLXWindow; diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 155cf83d93ca..bd9d72958a8b 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -45,7 +45,6 @@ namespace toolkit OAccessibleControlContext::OAccessibleControlContext() - : OAccessibleControlContext_Base(&m_aLock) { // nothing to do here, we have a late ctor } diff --git a/toolkit/source/helper/externallock.cxx b/toolkit/source/helper/externallock.cxx deleted file mode 100644 index 4e4e5e92ca16..000000000000 --- a/toolkit/source/helper/externallock.cxx +++ /dev/null @@ -1,37 +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 . - */ - -#include -#include -#include - - -// class VCLExternalSolarLock - -void VCLExternalSolarLock::acquire() -{ - Application::GetSolarMutex().acquire(); -} - -void VCLExternalSolarLock::release() -{ - Application::GetSolarMutex().release(); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit