From 6a873638fa0cc66f95832d46a5cea81a0dc76ecc Mon Sep 17 00:00:00 2001 From: Tobias Lippert Date: Wed, 16 Jul 2014 21:22:34 +0200 Subject: Renamed brdcst.[hc]xx to SfxBroadcaster.[hc]xx - Remove includes from files where they are not needed. - Update pch files Change-Id: I0188e3934ef429008c1ef495ab1d5b27f38664d5 Reviewed-on: https://gerrit.libreoffice.org/10342 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- svl/Library_svl.mk | 2 +- svl/source/inc/poolio.hxx | 2 +- svl/source/items/itempool.cxx | 2 +- svl/source/items/poolio.cxx | 2 +- svl/source/notify/SfxBroadcaster.cxx | 150 +++++++++++++++++++++++++++++++++++ svl/source/notify/brdcst.cxx | 150 ----------------------------------- svl/source/notify/lstner.cxx | 2 +- 7 files changed, 155 insertions(+), 155 deletions(-) create mode 100644 svl/source/notify/SfxBroadcaster.cxx delete mode 100644 svl/source/notify/brdcst.cxx (limited to 'svl') diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index f52770136f59..7b2b2ee399d7 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -121,7 +121,7 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/misc/sharedstringpool \ svl/source/misc/strmadpt \ svl/source/misc/urihelper \ - svl/source/notify/brdcst \ + svl/source/notify/SfxBroadcaster \ svl/source/notify/broadcast \ svl/source/notify/hint \ svl/source/notify/isethint \ diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 9e3ccd162da8..02e1c60913e9 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVL_SOURCE_INC_POOLIO_HXX #define INCLUDED_SVL_SOURCE_INC_POOLIO_HXX -#include +#include #include #include #include diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 1990d4639e9f..96c318b1782d 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -23,7 +23,7 @@ #include #include "whassert.hxx" -#include +#include #include #include "poolio.hxx" diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 22b22cdf7b40..374a8f1175fc 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -25,7 +25,7 @@ #include #include #include "whassert.hxx" -#include +#include #include #include "poolio.hxx" #include diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx new file mode 100644 index 000000000000..2fe79033b3b7 --- /dev/null +++ b/svl/source/notify/SfxBroadcaster.cxx @@ -0,0 +1,150 @@ +/* -*- 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 +#include +#include + +#include +#include + +TYPEINIT0(SfxBroadcaster); + + +// broadcast immediately + +void SfxBroadcaster::Broadcast( const SfxHint &rHint ) +{ + // notify all registered listeners exactly once + for (size_t n = 0; n < m_Listeners.size(); ++n) + { + SfxListener *const pListener = m_Listeners[n]; + if (pListener) { + pListener->Notify( *this, rHint ); + } + } +} + +// unregister all listeners + +SfxBroadcaster::~SfxBroadcaster() +{ + Broadcast( SfxSimpleHint(SFX_HINT_DYING) ); + + // remove all still registered listeners + for (size_t nPos = 0; nPos < m_Listeners.size(); ++nPos) + { + SfxListener *const pListener = m_Listeners[nPos]; + if (pListener) { + pListener->RemoveBroadcaster_Impl(*this); + } + } +} + + +// simple ctor of class SfxBroadcaster + +SfxBroadcaster::SfxBroadcaster() +{ +} + + +// copy ctor of class SfxBroadcaster + + +SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster &rBC ) +{ + for (size_t n = 0; n < rBC.m_Listeners.size(); ++n) + { + SfxListener *const pListener = rBC.m_Listeners[n]; + if (pListener) { + pListener->StartListening( *this ); + } + } +} + + +// add a new SfxListener to the list + +void SfxBroadcaster::AddListener( SfxListener& rListener ) +{ + for (size_t i = 0; i < m_Listeners.size(); ++i) + { + if (!m_Listeners[i]) // removed by RemoveListener? + { + m_Listeners[i] = &rListener; + return; + } + } + m_Listeners.push_back(&rListener); +} + + +// called, if no more listeners exists + +void SfxBroadcaster::ListenersGone() +{ +} + + +// forward a notification to all registered listeners + +void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint) +{ + for (size_t i = 0; i < m_Listeners.size(); ++i) + { + SfxListener *const pListener = m_Listeners[i]; + if (pListener) { + pListener->Notify( rBC, rHint ); + } + } +} + + +// remove one SfxListener from the list + +void SfxBroadcaster::RemoveListener( SfxListener& rListener ) +{ + SfxListenerArr_Impl::iterator aIter = std::find( + m_Listeners.begin(), m_Listeners.end(), &rListener); + assert(aIter != m_Listeners.end()); // "RemoveListener: Listener unknown" + // DO NOT erase the listener, set the pointer to 0 + // because the current continuation may contain this->Broadcast + *aIter = 0; + + if ( !HasListeners() ) + ListenersGone(); +} + +bool SfxBroadcaster::HasListeners() const +{ + for (size_t i = 0; i < m_Listeners.size(); ++i) + { + if (m_Listeners[i]) { + return true; + } + } + return false; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx deleted file mode 100644 index 49496e1488fe..000000000000 --- a/svl/source/notify/brdcst.cxx +++ /dev/null @@ -1,150 +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 -#include -#include - -#include -#include - -TYPEINIT0(SfxBroadcaster); - - -// broadcast immediately - -void SfxBroadcaster::Broadcast( const SfxHint &rHint ) -{ - // notify all registered listeners exactly once - for (size_t n = 0; n < m_Listeners.size(); ++n) - { - SfxListener *const pListener = m_Listeners[n]; - if (pListener) { - pListener->Notify( *this, rHint ); - } - } -} - -// unregister all listeners - -SfxBroadcaster::~SfxBroadcaster() -{ - Broadcast( SfxSimpleHint(SFX_HINT_DYING) ); - - // remove all still registered listeners - for (size_t nPos = 0; nPos < m_Listeners.size(); ++nPos) - { - SfxListener *const pListener = m_Listeners[nPos]; - if (pListener) { - pListener->RemoveBroadcaster_Impl(*this); - } - } -} - - -// simple ctor of class SfxBroadcaster - -SfxBroadcaster::SfxBroadcaster() -{ -} - - -// copy ctor of class SfxBroadcaster - - -SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster &rBC ) -{ - for (size_t n = 0; n < rBC.m_Listeners.size(); ++n) - { - SfxListener *const pListener = rBC.m_Listeners[n]; - if (pListener) { - pListener->StartListening( *this ); - } - } -} - - -// add a new SfxListener to the list - -void SfxBroadcaster::AddListener( SfxListener& rListener ) -{ - for (size_t i = 0; i < m_Listeners.size(); ++i) - { - if (!m_Listeners[i]) // removed by RemoveListener? - { - m_Listeners[i] = &rListener; - return; - } - } - m_Listeners.push_back(&rListener); -} - - -// called, if no more listeners exists - -void SfxBroadcaster::ListenersGone() -{ -} - - -// forward a notification to all registered listeners - -void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint) -{ - for (size_t i = 0; i < m_Listeners.size(); ++i) - { - SfxListener *const pListener = m_Listeners[i]; - if (pListener) { - pListener->Notify( rBC, rHint ); - } - } -} - - -// remove one SfxListener from the list - -void SfxBroadcaster::RemoveListener( SfxListener& rListener ) -{ - SfxListenerArr_Impl::iterator aIter = std::find( - m_Listeners.begin(), m_Listeners.end(), &rListener); - assert(aIter != m_Listeners.end()); // "RemoveListener: Listener unknown" - // DO NOT erase the listener, set the pointer to 0 - // because the current continuation may contain this->Broadcast - *aIter = 0; - - if ( !HasListeners() ) - ListenersGone(); -} - -bool SfxBroadcaster::HasListeners() const -{ - for (size_t i = 0; i < m_Listeners.size(); ++i) - { - if (m_Listeners[i]) { - return true; - } - } - return false; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 331f60017b9b..46025d591ee5 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include -- cgit eature/calczoom'>feature/calczoom LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/svl/JunitTest_svl_complex.mk
AgeCommit message (Expand)Author