From 025db4982dc0305d1e346f1342d2fc7dde139c02 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 24 Jan 2015 14:03:44 +0100 Subject: Revert "Typo: ..syncronous..=>synchronous (dbaccess)" This reverts commit 285654bf79f4e09d9ac0f6974db08df85446a500. --- include/dbaccess/AsynchronousLink.hxx | 66 ---------------------------------- include/dbaccess/AsyncronousLink.hxx | 66 ++++++++++++++++++++++++++++++++++ include/dbaccess/genericcontroller.hxx | 6 ++-- 3 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 include/dbaccess/AsynchronousLink.hxx create mode 100644 include/dbaccess/AsyncronousLink.hxx (limited to 'include/dbaccess') diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx deleted file mode 100644 index 155630db7e06..000000000000 --- a/include/dbaccess/AsynchronousLink.hxx +++ /dev/null @@ -1,66 +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_DBACCESS_ASYNCRONOUSLINK_HXX -#define INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX - -#include -#include - -struct ImplSVEvent; - -namespace dbaui -{ - - // a helper for multi-threaded handling of async events - - /** handles asynchronous links which may be called in multi-threaded environments - If you use an instance of this class as member of your own class, it will handle - several crucial points for you (for instance the case that somebody posts the - event while another thread tries to delete this event in the _destructor_ of the - class). - */ - class OAsynchronousLink - { - Link m_aHandler; - - protected: - ::osl::Mutex m_aEventSafety; - ::osl::Mutex m_aDestructionSafety; - ImplSVEvent * m_nEventId; - - public: - /** constructs the object - @param _rHandler The link to be called asynchronously - */ - OAsynchronousLink( const Link& _rHandler ); - virtual ~OAsynchronousLink(); - - bool IsRunning() const { return m_nEventId != 0; } - - void Call( void* _pArgument = NULL ); - void CancelCall(); - - protected: - DECL_LINK(OnAsyncCall, void*); - }; -} -#endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/AsyncronousLink.hxx b/include/dbaccess/AsyncronousLink.hxx new file mode 100644 index 000000000000..b0ba02d854be --- /dev/null +++ b/include/dbaccess/AsyncronousLink.hxx @@ -0,0 +1,66 @@ +/* -*- 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_DBACCESS_ASYNCRONOUSLINK_HXX +#define INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX + +#include +#include + +struct ImplSVEvent; + +namespace dbaui +{ + + // a helper for multi-threaded handling of async events + + /** handles asynchronous links which may be called in multi-threaded environments + If you use an instance of this class as member of your own class, it will handle + several crucial points for you (for instance the case that somebody posts the + event while another thread tries to delete this event in the _destructor_ of the + class). + */ + class OAsyncronousLink + { + Link m_aHandler; + + protected: + ::osl::Mutex m_aEventSafety; + ::osl::Mutex m_aDestructionSafety; + ImplSVEvent * m_nEventId; + + public: + /** constructs the object + @param _rHandler The link to be called asyncronously + */ + OAsyncronousLink( const Link& _rHandler ); + virtual ~OAsyncronousLink(); + + bool IsRunning() const { return m_nEventId != 0; } + + void Call( void* _pArgument = NULL ); + void CancelCall(); + + protected: + DECL_LINK(OnAsyncCall, void*); + }; +} +#endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index c8dbb0b2660c..79169c3ff9ba 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -238,8 +238,8 @@ namespace dbaui ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque StateCache m_aStateCache; // save the current status of feature state Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes - OAsynchronousLink m_aAsyncInvalidateAll; - OAsynchronousLink m_aAsyncCloseTask; // called when a task should be closed + OAsyncronousLink m_aAsyncInvalidateAll; + OAsyncronousLink m_aAsyncCloseTask; // called when a task should be closed ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; -- cgit