diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 16:15:38 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 17:30:02 +0100 |
commit | 250a4e8875d97a75683349415502a345f03138a0 (patch) | |
tree | 4c05e412a941940c9f7d076a850da6705c5343e5 /framework | |
parent | 8b2c7983330aed62fb80cf4ca05375e9ccf7ad13 (diff) |
Remove newly unused framework::Guard
Change-Id: I49650bfd036c5df22f81c3e8cf30bc0795154a30
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/threadhelp/guard.hxx | 71 | ||||
-rw-r--r-- | framework/source/fwe/classes/rootactiontriggercontainer.cxx | 1 | ||||
-rw-r--r-- | framework/source/fwi/classes/propertysethelper.cxx | 1 | ||||
-rw-r--r-- | framework/source/helper/statusindicator.cxx | 1 | ||||
-rw-r--r-- | framework/source/services/dispatchhelper.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/addonstoolbarwrapper.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/menubarwrapper.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/progressbarwrapper.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/statusbarwrapper.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/toolbarwrapper.cxx | 1 |
11 files changed, 0 insertions, 81 deletions
diff --git a/framework/inc/threadhelp/guard.hxx b/framework/inc/threadhelp/guard.hxx deleted file mode 100644 index 9ba1f4a16df8..000000000000 --- a/framework/inc/threadhelp/guard.hxx +++ /dev/null @@ -1,71 +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_FRAMEWORK_INC_THREADHELP_GUARD_HXX -#define INCLUDED_FRAMEWORK_INC_THREADHELP_GUARD_HXX - -#include <sal/config.h> - -#include <boost/noncopyable.hpp> - -#include <threadhelp/lockhelper.hxx> - -namespace framework{ - -class Guard : private boost::noncopyable -{ -public: - Guard( LockHelper& rLock ) - : m_pLock ( &rLock ) - , m_locked(false) - { - lock(); - } - - ~Guard() - { - unlock(); - } - - void lock() - { - if (!m_locked) { - m_pLock->acquire(); - m_locked = true; - } - } - - void unlock() - { - if (m_locked) { - m_pLock->release(); - m_locked = false; - } - } - -private: - LockHelper* m_pLock; - bool m_locked; -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 1cbc63182a65..d6079fb82a73 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -26,7 +26,6 @@ #include <cppuhelper/typeprovider.hxx> #include <framework/actiontriggerhelper.hxx> #include <osl/mutex.hxx> -#include <threadhelp/guard.hxx> #include <vcl/svapp.hxx> using namespace cppu; diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 636b5df45bdb..338e0036147b 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -23,7 +23,6 @@ #include <classes/propertysethelper.hxx> #include <threadhelp/transactionguard.hxx> -#include <threadhelp/guard.hxx> namespace framework{ diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index ab9e4cc86142..2889d58f096a 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -21,7 +21,6 @@ #include <helper/statusindicator.hxx> -#include <threadhelp/guard.hxx> namespace framework{ diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 050885a62cb0..355ad53115d3 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -18,7 +18,6 @@ */ #include <services/dispatchhelper.hxx> -#include <threadhelp/guard.hxx> #include <services.h> #include <com/sun/star/util/URLTransformer.hpp> diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 413733930971..111b79742ce7 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -21,7 +21,6 @@ #include <uielement/toolbarmerger.hxx> #include <uielement/generictoolbarcontroller.hxx> -#include <threadhelp/guard.hxx> #include "services.h" #include <framework/imageproducer.hxx> #include <framework/sfxhelperfunctions.hxx> diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 03698c1bba45..dba446aaa049 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -18,7 +18,6 @@ */ #include <uielement/addonstoolbarwrapper.hxx> -#include <threadhelp/guard.hxx> #include <framework/actiontriggerhelper.hxx> #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 5dcb1845c07e..fe2f496d2365 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -18,7 +18,6 @@ */ #include <uielement/menubarwrapper.hxx> -#include <threadhelp/guard.hxx> #include <framework/actiontriggerhelper.hxx> #include <services.h> diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index b7e22a8c804a..10b67a492ec3 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -20,7 +20,6 @@ #include <uielement/progressbarwrapper.hxx> #include <helper/statusindicator.hxx> -#include <threadhelp/guard.hxx> #include <uielement/statusindicatorinterfacewrapper.hxx> #include <com/sun/star/ui/UIElementType.hpp> diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 528bed496d8c..2ebf4cd4982e 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -20,7 +20,6 @@ #include <uielement/statusbarwrapper.hxx> -#include <threadhelp/guard.hxx> #include <framework/actiontriggerhelper.hxx> #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index f9295f9c39b3..aa9e5ec85d3b 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -18,7 +18,6 @@ */ #include <uielement/toolbarwrapper.hxx> -#include <threadhelp/guard.hxx> #include <framework/actiontriggerhelper.hxx> #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> |