[Libreoffice-commits] core.git: 5 commits - framework/inc framework/source
Stephan Bergmann
sbergman at redhat.com
Mon Mar 17 10:07:31 PDT 2014
framework/inc/classes/menumanager.hxx | 2
framework/inc/dispatch/oxt_handler.hxx | 1
framework/inc/services/layoutmanager.hxx | 1
framework/inc/threadhelp/lockhelper.hxx | 17 -
framework/inc/threadhelp/resetableguard.hxx | 166 ----------
framework/source/classes/menumanager.cxx | 24 -
framework/source/dispatch/menudispatcher.cxx | 12
framework/source/dispatch/oxt_handler.cxx | 3
framework/source/dispatch/popupmenudispatcher.cxx | 11
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 12
framework/source/fwe/helper/propertysetcontainer.cxx | 12
framework/source/fwe/xml/statusbardocumenthandler.cxx | 14
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 14
framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx | 32 -
framework/source/fwi/jobs/configaccess.cxx | 1
framework/source/fwi/threadhelp/lockhelper.cxx | 2
framework/source/fwi/threadhelp/transactionmanager.cxx | 3
framework/source/fwi/uielement/constitemcontainer.cxx | 1
framework/source/fwi/uielement/itemcontainer.cxx | 1
framework/source/fwi/uielement/rootitemcontainer.cxx | 1
framework/source/helper/dockingareadefaultacceptor.cxx | 8
framework/source/helper/ocomponentaccess.cxx | 6
framework/source/helper/ocomponentenumeration.cxx | 8
framework/source/helper/oframes.cxx | 14
framework/source/helper/uiconfigelementwrapperbase.cxx | 16
framework/source/helper/uielementwrapperbase.cxx | 4
framework/source/inc/loadenv/actionlockguard.hxx | 10
framework/source/jobs/helponstartup.cxx | 12
framework/source/jobs/jobdispatch.cxx | 1
framework/source/layoutmanager/helpers.cxx | 1
framework/source/layoutmanager/layoutmanager.cxx | 1
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 1
framework/source/loadenv/loadenv.cxx | 1
framework/source/services/frame.cxx | 1
framework/source/services/tabwindowservice.cxx | 18 -
framework/source/tabwin/tabwindow.cxx | 36 +-
framework/source/tabwin/tabwinfactory.cxx | 4
framework/source/uiconfiguration/globalsettings.cxx | 10
framework/source/uiconfiguration/imagemanager.cxx | 4
framework/source/uiconfiguration/imagemanagerimpl.cxx | 44 +-
framework/source/uiconfiguration/moduleimagemanager.cxx | 1
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 44 +-
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 38 +-
framework/source/uielement/addonstoolbarmanager.cxx | 8
framework/source/uielement/addonstoolbarwrapper.cxx | 10
framework/source/uielement/controlmenucontroller.cxx | 1
framework/source/uielement/fontmenucontroller.cxx | 1
framework/source/uielement/fontsizemenucontroller.cxx | 1
framework/source/uielement/footermenucontroller.cxx | 1
framework/source/uielement/headermenucontroller.cxx | 1
framework/source/uielement/langselectionmenucontroller.cxx | 1
framework/source/uielement/macrosmenucontroller.cxx | 1
framework/source/uielement/menubarmanager.cxx | 28 -
framework/source/uielement/menubarwrapper.cxx | 16
framework/source/uielement/newmenucontroller.cxx | 1
framework/source/uielement/objectmenucontroller.cxx | 1
framework/source/uielement/progressbarwrapper.cxx | 20 -
framework/source/uielement/statusbarmanager.cxx | 36 +-
framework/source/uielement/statusbarwrapper.cxx | 10
framework/source/uielement/statusindicatorinterfacewrapper.cxx | 1
framework/source/uielement/toolbarmanager.cxx | 46 +-
framework/source/uielement/toolbarsmenucontroller.cxx | 1
framework/source/uielement/toolbarwrapper.cxx | 18 -
framework/source/uifactory/addonstoolbarfactory.cxx | 4
framework/source/uifactory/factoryconfiguration.cxx | 22 -
framework/source/xml/imagesdocumenthandler.cxx | 14
66 files changed, 311 insertions(+), 545 deletions(-)
New commits:
commit 60d14352f7a4bd1e9eb07f91b1c84b78dc82fbe4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 17 18:04:42 2014 +0100
Remove dead file
Change-Id: I53dfb7f9d49a4b383dc8a32e4cd3b30a4db47819
diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
deleted file mode 100644
index 8aeceab..0000000
--- a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
+++ /dev/null
@@ -1,31 +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 <stdio.h>
-
-#include <xml/toolboxlayoutdocumenthandler.hxx>
-#include <xml/toolboxconfigurationdefines.hxx>
-
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-
-#include <vcl/svapp.hxx>
-#include <vcl/toolbox.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 07b32bc2bf0cd329258b4924839e5b900b7e6196
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 17 18:00:10 2014 +0100
Consolidate framework::{Resetable,}Guard
Change-Id: I97290c2504992f4a92e6aeb71e02a2542dd35faa
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 706901f..7ce5f92 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX
#include <threadhelp/threadhelpbase.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index c1b8465..7f4d8e0 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX
#include <threadhelp/threadhelpbase.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <properties.h>
diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx
deleted file mode 100644
index d6377c5..0000000
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ /dev/null
@@ -1,165 +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_RESETABLEGUARD_HXX
-#define INCLUDED_FRAMEWORK_INC_THREADHELP_RESETABLEGUARD_HXX
-
-#include <boost/noncopyable.hpp>
-#include <threadhelp/lockhelper.hxx>
-
-#include <sal/types.h>
-
-
-namespace framework{
-
-/*-************************************************************************************************************
- @short implement a guard for implementing save thread access
- @descr These guard has an additional feature to well known one ::osl::Guard.
- You can lock() and unlock() it very often!
- A set bool flag inside protect this implementation against multiple lock() calls
- without any unlock()! So the increasing of guarded mutex couldn't be greater then 1 ...
-
- @attention To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private!
-
- @implements -
-
- @devstatus ready to use
-*//*-*************************************************************************************************************/
-class ResetableGuard : private boost::noncopyable
-{
-
- // public methods
-
- public:
-
- /*-****************************************************************************************************
- @short ctors
- @descr Use these ctor methods to initialize the guard right.
- Given lock reference must be valid - otherwise crashes could occur!
-
- @seealso -
-
- @param "pLock", pointer to lock helper of user
- @param "rLock", reference to lock helper of user
- @return -
-
- @onerror -
- *//*-*****************************************************************************************************/
- inline ResetableGuard( LockHelper* pLock )
- : m_pLock ( pLock )
- , m_bLocked ( sal_False )
- {
- lock();
- }
-
-
- inline ResetableGuard( LockHelper& rLock )
- : m_pLock ( &rLock )
- , m_bLocked ( sal_False )
- {
- lock();
- }
-
- /*-****************************************************************************************************
- @short dtor
- @descr We must release set mutex if programmer forget it ...
-
- @seealso -
-
- @param -
- @return -
-
- @onerror -
- *//*-*****************************************************************************************************/
- inline ~ResetableGuard()
- {
- unlock();
- }
-
- /*-****************************************************************************************************
- @short enable/disable the lock
- @descr Use this methods to lock or unlock the mutex.
- You can do it so often you wish to do that ...
-
- @attention We use another member to prevent us against multiple acquire calls of the same guard
- without suitable release calls!
- You don't must protect access at these bool member by using an own mutex ....
- because nobody use the same guard instance from different threads!
- It will be a function-local object every time.
-
- @seealso -
-
- @param -
- @return -
-
- @onerror -
- *//*-*****************************************************************************************************/
- inline void lock()
- {
- if( m_bLocked == sal_False )
- {
- m_pLock->acquire();
- m_bLocked = sal_True;
- }
- }
-
-
- inline void unlock()
- {
- if( m_bLocked == sal_True )
- {
- m_pLock->release();
- m_bLocked = sal_False;
- }
- }
-
-
- // private methods
-
- private:
-
- /*-****************************************************************************************************
- @short disable using of these functions!
- @descr It's not allowed to use this methods. Different problem can occur otherwise.
- Thats why we disable it by make it private.
-
- @seealso other ctor
-
- @param -
- @return -
-
- @onerror -
- *//*-*****************************************************************************************************/
- ResetableGuard();
-
-
- // private member
-
- private:
-
- LockHelper* m_pLock ; /// pointer to safed lock member of user
- sal_Bool m_bLocked ; /// protection against multiple lock() calls without unlock()
-
-}; // class ResetableGuard
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_RESETABLEGUARD_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index f09fbe8..c4e20fb 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -22,7 +22,7 @@
#include <framework/bmkmenu.hxx>
#include <framework/addonmenu.hxx>
#include <framework/imageproducer.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include "framework/addonsoptions.hxx"
#include <classes/fwkresid.hxx>
#include <services.h>
@@ -293,7 +293,7 @@ MenuManager::~MenuManager()
MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemId )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
std::vector< MenuItemHandler* >::iterator p;
for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
@@ -314,7 +314,7 @@ throw ( RuntimeException, std::exception )
MenuItemHandler* pStatusChangedMenu = NULL;
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
std::vector< MenuItemHandler* >::iterator p;
for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
@@ -332,7 +332,7 @@ throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarGuard;
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
sal_Bool bSetCheckmark = sal_False;
sal_Bool bCheckmark = sal_False;
@@ -372,7 +372,7 @@ throw ( RuntimeException, std::exception )
void MenuManager::RemoveListener()
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
ClearMenuDispatch();
}
@@ -411,7 +411,7 @@ void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( Runtim
{
if ( Source.Source == m_xFrame )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
ClearMenuDispatch(Source,false);
}
else
@@ -420,7 +420,7 @@ void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( Runtim
MenuItemHandler* pMenuItemDisposing = NULL;
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
std::vector< MenuItemHandler* >::iterator p;
for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
@@ -517,7 +517,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
}
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
int nRemoveItemCount = 0;
int nItemCount = pMenu->GetItemCount();
@@ -648,7 +648,7 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XCompone
}
{
- ResetableGuard aGuard( _rMutex );
+ Guard aGuard( _rMutex );
int nItemCount = pMenu->GetItemCount();
@@ -771,7 +771,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
{
URL aTargetURL;
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
if ( xDispatchProvider.is() )
@@ -841,7 +841,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
Reference< XDispatch > xDispatch;
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
sal_uInt16 nCurItemId = pMenu->GetCurItemId();
if ( pMenu == m_pVCLMenu &&
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index a71c621..a775af3 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -21,7 +21,7 @@
#include <general.h>
#include <framework/menuconfiguration.hxx>
#include <framework/addonmenu.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <services.h>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -113,7 +113,7 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat
const URL& aURL ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
// Method not defined for all incoming parameter
SAL_WARN_IF( !impldbg_checkParameter_addStatusListener( xControl, aURL ), "fwk", "MenuDispatcher::addStatusListener(): Invalid parameter detected." );
@@ -128,7 +128,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X
const URL& aURL ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
// Method not defined for all incoming parameter
SAL_WARN_IF( !impldbg_checkParameter_removeStatusListener( xControl, aURL ), "fwk", "MenuDispatcher::removeStatusListener(): Invalid parameter detected." );
@@ -142,7 +142,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X
void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_pMenuManager && aEvent.Action == FrameAction_FRAME_UI_ACTIVATED )
{
@@ -180,7 +180,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro
void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
SAL_WARN_IF( m_bAlreadyDisposed, "fwk", "MenuDispatcher::disposing(): Object already disposed .. don't call it again!" );
@@ -255,7 +255,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
if ( pWindow )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
SystemWindow* pSysWindow = (SystemWindow *)pWindow;
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index de0fa0b..b24eaec 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -18,6 +18,7 @@
*/
#include <dispatch/oxt_handler.hxx>
+#include <threadhelp/guard.hxx>
#include <threadhelp/transactionguard.hxx>
#include <services.h>
#include <unotools/mediadescriptor.hxx>
@@ -117,7 +118,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
throw( css::uno::RuntimeException, std::exception )
{
// SAFE {
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog";
css::uno::Sequence< css::uno::Any > lParams(1);
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 1419cfe..3a91779 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -21,7 +21,6 @@
#include <general.h>
#include <framework/menuconfiguration.hxx>
#include <framework/addonmenu.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <threadhelp/guard.hxx>
#include <services.h>
#include <properties.h>
@@ -181,7 +180,7 @@ throw( css::uno::RuntimeException, std::exception )
if ( rURL.Complete.startsWith( "vnd.sun.star.popup:" ) )
{
// --- SAFE ---
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
impl_RetrievePopupControllerQuery();
impl_CreateUriRefFactory();
@@ -260,7 +259,7 @@ void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XSta
throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
// Add listener to container.
m_aListenerContainer.addInterface( aURL.Complete, xControl );
@@ -271,7 +270,7 @@ void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< X
throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
// Add listener to container.
m_aListenerContainer.removeInterface( aURL.Complete, xControl );
@@ -280,7 +279,7 @@ throw( RuntimeException, std::exception )
void SAL_CALL PopupMenuDispatcher::frameAction( const FrameActionEvent& aEvent )
throw ( RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if (( aEvent.Action == css::frame::FrameAction_COMPONENT_DETACHING ) ||
( aEvent.Action == css::frame::FrameAction_COMPONENT_ATTACHED ))
@@ -293,7 +292,7 @@ throw ( RuntimeException, std::exception )
void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
SAL_WARN_IF( m_bAlreadyDisposed, "fwk", "MenuDispatcher::disposing(): Object already disposed .. don't call it again!" );
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 1ef8b98..6670e76 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -26,7 +26,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <framework/actiontriggerhelper.hxx>
#include <osl/mutex.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <vcl/svapp.hxx>
using namespace cppu;
@@ -126,7 +126,7 @@ throw ( RuntimeException, std::exception )
void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element )
throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
FillContainer();
@@ -139,7 +139,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
FillContainer();
@@ -153,7 +153,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element )
throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
FillContainer();
@@ -167,7 +167,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
sal_Int32 SAL_CALL RootActionTriggerContainer::getCount()
throw ( RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
{
@@ -188,7 +188,7 @@ throw ( RuntimeException, std::exception )
Any SAL_CALL RootActionTriggerContainer::getByIndex( sal_Int32 Index )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
FillContainer();
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 670359a..347f83c 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -18,7 +18,7 @@
*/
#include <helper/propertysetcontainer.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <vcl/svapp.hxx>
@@ -79,7 +79,7 @@ throw ( RuntimeException, std::exception )
void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
sal_Int32 nSize = m_aPropertySetVector.size();
@@ -112,7 +112,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com:
void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( (sal_Int32)m_aPropertySetVector.size() > nIndex )
{
@@ -149,7 +149,7 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com
sal_Int32 SAL_CALL PropertySetContainer::getCount()
throw ( RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return m_aPropertySetVector.size();
}
@@ -157,7 +157,7 @@ sal_Int32 SAL_CALL PropertySetContainer::getCount()
Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( (sal_Int32)m_aPropertySetVector.size() > Index )
{
@@ -174,7 +174,7 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
sal_Bool SAL_CALL PropertySetContainer::hasElements()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return !( m_aPropertySetVector.empty() );
}
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 93fdbb2..a0f45f7 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -20,7 +20,7 @@
#include <stdio.h>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <xml/statusbardocumenthandler.hxx>
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
@@ -191,7 +191,7 @@ throw ( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadStatusBarDocumentHandler::endDocument(void)
throw( SAXException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if (( m_bStatusBarStartFound && !m_bStatusBarEndFound ) ||
( !m_bStatusBarStartFound && m_bStatusBarEndFound ) )
@@ -206,7 +206,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs )
throw( SAXException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
StatusBarHashMap::const_iterator pStatusBarEntry = m_aStatusBarMap.find( aName ) ;
if ( pStatusBarEntry != m_aStatusBarMap.end() )
@@ -405,7 +405,7 @@ throw( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName)
throw( SAXException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
StatusBarHashMap::const_iterator pStatusBarEntry = m_aStatusBarMap.find( aName ) ;
if ( pStatusBarEntry != m_aStatusBarMap.end() )
@@ -464,14 +464,14 @@ void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator(
const Reference< XLocator > &xLocator)
throw( SAXException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
m_xLocator = xLocator;
}
OUString OReadStatusBarDocumentHandler::getErrorLineString()
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
char buffer[32];
@@ -510,7 +510,7 @@ OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler()
void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
( SAXException, RuntimeException )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
m_xWriteDocumentHandler->startDocument();
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 07367a4..fcef408 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -20,7 +20,7 @@
#include <stdio.h>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <xml/toolboxdocumenthandler.hxx>
#include <xml/toolboxconfigurationdefines.hxx>
@@ -204,7 +204,7 @@ throw ( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadToolBoxDocumentHandler::endDocument(void)
throw( SAXException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if (( m_bToolBarStartFound && !m_bToolBarEndFound ) ||
( !m_bToolBarStartFound && m_bToolBarEndFound ) )
@@ -219,7 +219,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs )
throw( SAXException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName ) ;
if ( pToolBoxEntry != m_aToolBoxMap.end() )
@@ -537,7 +537,7 @@ throw( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName)
throw( SAXException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
ToolBoxHashMap::const_iterator pToolBoxEntry = m_aToolBoxMap.find( aName ) ;
if ( pToolBoxEntry != m_aToolBoxMap.end() )
@@ -635,14 +635,14 @@ void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator(
const Reference< XLocator > &xLocator)
throw( SAXException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
m_xLocator = xLocator;
}
OUString OReadToolBoxDocumentHandler::getErrorLineString()
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
char buffer[32];
@@ -681,7 +681,7 @@ OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler()
void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
( SAXException, RuntimeException )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
m_xWriteDocumentHandler->startDocument();
diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
index 399e5893..8aeceab 100644
--- a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
@@ -20,7 +20,6 @@
#include <stdio.h>
-#include <threadhelp/resetableguard.hxx>
#include <xml/toolboxlayoutdocumenthandler.hxx>
#include <xml/toolboxconfigurationdefines.hxx>
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index d9c6300..f83d429 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -19,7 +19,6 @@
#include <jobs/configaccess.hxx>
#include <threadhelp/guard.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <general.h>
#include <services.h>
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index bd13359..9f4cdd9 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -18,7 +18,6 @@
*/
#include <threadhelp/transactionmanager.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <macros/generic.hxx>
@@ -137,7 +136,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode )
{
// Object is uninitialized ...
// Make member access threadsafe!
- ResetableGuard aGuard( m_aMutex );
+ Guard aGuard( m_aMutex );
// Check working mode again .. because another instance could be faster.
// (It's possible to set this guard at first of this method too!)
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 2c758ab..633989a 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -22,7 +22,6 @@
#include <uielement/constitemcontainer.hxx>
#include <uielement/rootitemcontainer.hxx>
#include <uielement/itemcontainer.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 6871a75..a7b243a 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -19,7 +19,6 @@
#include <uielement/itemcontainer.hxx>
#include <uielement/constitemcontainer.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <comphelper/servicehelper.hxx>
using namespace cppu;
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 275b68d..712cb2c 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -24,7 +24,6 @@
#include <uielement/rootitemcontainer.hxx>
#include <uielement/itemcontainer.hxx>
#include <uielement/constitemcontainer.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <general.h>
#include <properties.h>
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 4b4271f..f0746ee 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -18,7 +18,7 @@
*/
#include <helper/dockingareadefaultacceptor.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/awt/PosSize.hpp>
@@ -58,7 +58,7 @@ DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor()
css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception)
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Try to "lock" the frame for access to taskscontainer.
css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
@@ -70,7 +70,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::ge
sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception)
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Try to "lock" the frame for access to taskscontainer.
css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
@@ -107,7 +107,7 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css
void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception)
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Try to "lock" the frame for access to taskscontainer.
css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 142758d..65a150f 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -20,7 +20,7 @@
#include <helper/ocomponentaccess.hxx>
#include <helper/ocomponentenumeration.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -61,7 +61,7 @@ OComponentAccess::~OComponentAccess()
css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Set default return value, if method failed.
// If no desktop exist and there is no task container - return an empty enumeration!
@@ -99,7 +99,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e
sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Set default return value, if method failed.
sal_Bool bReturn = sal_False;
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 9342dee..e7e1eaa 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -19,7 +19,7 @@
#include <helper/ocomponentenumeration.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <vcl/svapp.hxx>
@@ -66,7 +66,7 @@ OComponentEnumeration::~OComponentEnumeration()
void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
// This method is not specified for all incoming parameters.
@@ -82,7 +82,7 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro
sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// First position in a valid list is 0.
// => The last one is getLength() - 1!
@@ -99,7 +99,7 @@ Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementExcepti
RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// If we have no elements or end of enumeration is arrived ...
if ( hasMoreElements() == sal_False )
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index f0ce0c2..d20904a 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -19,7 +19,7 @@
#include <helper/oframes.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -68,7 +68,7 @@ OFrames::~OFrames()
void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
// Method is not defined for ALL incoming parameters!
@@ -93,7 +93,7 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr
void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
// Method is not defined for ALL incoming parameters!
@@ -119,7 +119,7 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr
Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Safe impossible cases
// Method is not defined for ALL incoming parameters!
@@ -225,7 +225,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Set default return value.
sal_Int32 nCount = 0;
@@ -251,7 +251,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
sal_uInt32 nCount = m_pFrameContainer->getCount();
if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount ))
@@ -288,7 +288,7 @@ Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception
sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
// Set default return value.
sal_Bool bHasElements = sal_False;
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index e9229ed..446ab6a 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -20,7 +20,7 @@
#include <helper/uiconfigelementwrapperbase.hxx>
#include <general.h>
#include <properties.h>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <uielement/constitemcontainer.hxx>
#include <uielement/rootitemcontainer.hxx>
@@ -109,14 +109,14 @@ void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun:
void SAL_CALL UIConfigElementWrapperBase::disposing( const EventObject& )
throw( RuntimeException, std::exception )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
m_xConfigSource.clear();
}
void SAL_CALL UIConfigElementWrapperBase::initialize( const Sequence< Any >& aArguments )
throw ( Exception, RuntimeException, std::exception )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( !m_bInitialized )
{
@@ -452,7 +452,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE
}
void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException, std::exception )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( xSettings.is() )
@@ -491,7 +491,7 @@ void UIConfigElementWrapperBase::impl_fillNewData()
}
Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException, std::exception )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( bWriteable )
@@ -502,20 +502,20 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_
Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException, std::exception)
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
Reference< XFrame > xFrame( m_xWeakFrame );
return xFrame;
}
OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException, std::exception)
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
return m_aResourceURL;
}
::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException, std::exception)
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
return m_nType;
}
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 45f3790..c59a1d8 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -20,7 +20,7 @@
#include <helper/uielementwrapperbase.hxx>
#include <general.h>
#include <properties.h>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -88,7 +88,7 @@ void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star:
void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArguments )
throw ( Exception, RuntimeException, std::exception )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( !m_bInitialized )
{
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 0fb34d4..e399550 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -22,7 +22,7 @@
#include <threadhelp/threadhelpbase.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <com/sun/star/document/XActionLockable.hpp>
@@ -104,7 +104,7 @@ class ActionLockGuard : private ThreadHelpBase
virtual sal_Bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock)
{
// SAFE -> ..........................
- ResetableGuard aMutexLock(m_aLock);
+ Guard aMutexLock(m_aLock);
if (m_bActionLocked || !xLock.is())
return sal_False;
@@ -132,7 +132,7 @@ class ActionLockGuard : private ThreadHelpBase
virtual void freeResource()
{
// SAFE -> ..........................
- ResetableGuard aMutexLock(m_aLock);
+ Guard aMutexLock(m_aLock);
css::uno::Reference< css::document::XActionLockable > xLock = m_xActionLock ;
sal_Bool bLocked = m_bActionLocked;
@@ -152,7 +152,7 @@ class ActionLockGuard : private ThreadHelpBase
virtual void lock()
{
// SAFE -> ..........................
- ResetableGuard aMutexLock(m_aLock);
+ Guard aMutexLock(m_aLock);
if (!m_bActionLocked && m_xActionLock.is())
{
@@ -167,7 +167,7 @@ class ActionLockGuard : private ThreadHelpBase
virtual void unlock()
{
// SAFE -> ..........................
- ResetableGuard aMutexLock(m_aLock);
+ Guard aMutexLock(m_aLock);
if (m_bActionLocked && m_xActionLock.is())
{
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 56d9ace..95f90c4 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -21,7 +21,7 @@
// include own header
#include <jobs/helponstartup.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <loadenv/targethelper.hxx>
#include <services.h>
@@ -164,7 +164,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
throw(css::uno::RuntimeException, std::exception)
{
// SAFE ->
- ResetableGuard aLock(m_aLock);
+ Guard aLock(m_aLock);
if (aEvent.Source == m_xModuleManager)
m_xModuleManager.clear();
@@ -211,7 +211,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be
// OK - now we are sure this document is a top level document.
// Classify it.
// SAFE ->
- ResetableGuard aLock(m_aLock);
+ Guard aLock(m_aLock);
css::uno::Reference< css::frame::XModuleManager2 > xModuleManager = m_xModuleManager;
aLock.unlock();
// <- SAFE
@@ -233,7 +233,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be
OUString HelpOnStartup::its_getCurrentHelpURL()
{
// SAFE ->
- ResetableGuard aLock(m_aLock);
+ Guard aLock(m_aLock);
css::uno::Reference< css::frame::XDesktop2 > xDesktop = m_xDesktop;
aLock.unlock();
// <- SAFE
@@ -278,7 +278,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
return sal_False;
// SAFE ->
- ResetableGuard aLock(m_aLock);
+ Guard aLock(m_aLock);
css::uno::Reference< css::container::XNameAccess > xConfig = m_xConfig;
OUString sLocale = m_sLocale;
OUString sSystem = m_sSystem;
@@ -322,7 +322,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule)
{
// SAFE ->
- ResetableGuard aLock(m_aLock);
+ Guard aLock(m_aLock);
css::uno::Reference< css::container::XNameAccess > xConfig = m_xConfig;
OUString sLocale = m_sLocale;
OUString sSystem = m_sSystem;
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 57c63b91..f39a26c 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -21,7 +21,6 @@
#include <jobs/joburl.hxx>
#include <jobs/job.hxx>
#include <threadhelp/guard.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <threadhelp/threadhelpbase.hxx>
#include <classes/converter.hxx>
#include <general.h>
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 6531b12..0a9eb6b 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -18,7 +18,6 @@
*/
#include "helpers.hxx"
-#include <threadhelp/resetableguard.hxx>
#include <services.h>
#include <com/sun/star/ui/DockingArea.hpp>
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index b464e86..2e9ce24 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -20,7 +20,6 @@
#include <services/layoutmanager.hxx>
#include <helpers.hxx>
#include <threadhelp/guard.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <framework/sfxhelperfunctions.hxx>
#include <uielement/menubarwrapper.hxx>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index cc93864..a507ea3 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -26,7 +26,6 @@
#include <vector>
#include <threadhelp/threadhelpbase.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 948734e..8079c4b 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -24,7 +24,6 @@
#include <interaction/quietinteraction.hxx>
#include <threadhelp/guard.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <properties.h>
#include <protocols.h>
#include <services.h>
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 042d3cb..4d571e3 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -32,7 +32,6 @@
#include <dispatch/dispatchinformationprovider.hxx>
#include <classes/framecontainer.hxx>
#include <classes/propertysethelper.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <threadhelp/guard.hxx>
#include <threadhelp/threadhelpbase.hxx>
#include <threadhelp/transactionguard.hxx>
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 6ef05ff..65d7110 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -18,7 +18,7 @@
*/
#include <classes/fwktabwindow.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <services.h>
#include <properties.h>
@@ -241,7 +241,7 @@ void TabWindowService::initProperties()
TabWindowService::~TabWindowService()
{
// SAFE->
- ResetableGuard aGuard(m_aLock);
+ Guard aGuard(m_aLock);
if (m_pTabWin)
m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) );
@@ -254,7 +254,7 @@ TabWindowService::~TabWindowService()
throw ( css::uno::RuntimeException, std::exception )
{
// SAFE ->
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
::sal_Int32 nID = m_nPageIndexCounter++;
TTabPageInfo aInfo(nID);
@@ -272,7 +272,7 @@ void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID)
css::uno::RuntimeException, std::exception )
{
// SAFE ->
- ResetableGuard aGuard(m_aLock);
+ Guard aGuard(m_aLock);
// throws suitable IndexOutOfBoundsException .-)
TTabPageInfoHash::iterator pIt = impl_getTabPageInfo (nID);
@@ -292,7 +292,7 @@ void SAL_CALL TabWindowService::setTabProps( ::sal_Int32
css::uno::RuntimeException, std::exception )
{
// SAFE ->
- ResetableGuard aGuard(m_aLock);
+ Guard aGuard(m_aLock);
// throws suitable IndexOutOfBoundsException .-)
TTabPageInfoHash::iterator pIt = impl_getTabPageInfo (nID);
@@ -318,7 +318,7 @@ css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabPr
css::uno::RuntimeException, std::exception )
{
// SAFE ->
- ResetableGuard aGuard(m_aLock);
+ Guard aGuard(m_aLock);
// throws suitable IndexOutOfBoundsException .-)
TTabPageInfoHash::const_iterator pIt = impl_getTabPageInfo (nID);
@@ -335,7 +335,7 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID)
css::uno::RuntimeException, std::exception )
{
// SAFE ->
- ResetableGuard aGuard(m_aLock);
+ Guard aGuard(m_aLock);
// throws suitable IndexOutOfBoundsException .-)
impl_checkTabIndex (nID);
@@ -353,7 +353,7 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID)
throw (css::uno::RuntimeException, std::exception)
{
// SAFE->
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return m_nCurrentPageIndex;
}
@@ -382,7 +382,7 @@ void SAL_CALL TabWindowService::dispose()
throw (css::uno::RuntimeException, std::exception)
{
// SAFE->
- ResetableGuard aGuard(m_aLock);
+ Guard aGuard(m_aLock);
css::uno::Reference< css::uno::XInterface > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
css::lang::EventObject aEvent(xThis);
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 2e22325..99664b8 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -20,7 +20,7 @@
#include <tabwin/tabwindow.hxx>
#include <properties.h>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/awt/Toolkit.hpp>
@@ -112,7 +112,7 @@ void TabWindow::implts_LayoutWindows() const
const sal_Int32 nTabControlHeight = 30;
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
css::uno::Reference< css::awt::XDevice > xDevice( m_xTopWindow, css::uno::UNO_QUERY );
css::uno::Reference< css::awt::XWindow > xWindow( m_xTopWindow, css::uno::UNO_QUERY );
css::uno::Reference< css::awt::XWindow > xTabControlWindow( m_xTabControlWindow );
@@ -239,7 +239,7 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, con
IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
sal_Int32 nPageId = pTabControl->GetCurPageId();
@@ -256,7 +256,7 @@ IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl )
IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
sal_Int32 nPageId = pTabControl->GetCurPageId();
aLock.unlock();
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -280,7 +280,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
css::awt::Size aSize( aDefaultSize );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
sal_Bool bInitalized( m_bInitialized );
css::uno::Reference< css::uno::XComponentContext > xContext( m_xContext );
aLock.unlock();
@@ -436,7 +436,7 @@ void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::excep
m_aListenerContainer.disposeAndClear( aEvent );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
css::uno::Reference< css::awt::XWindow > xTabControlWindow( m_xTabControlWindow );
css::uno::Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow );
css::uno::Reference< css::awt::XTopWindow > xTopWindow( m_xTopWindow );
@@ -469,7 +469,7 @@ void SAL_CALL TabWindow::addEventListener( const css::uno::Reference< css::lang:
throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
return;
aLock.unlock();
@@ -482,7 +482,7 @@ void SAL_CALL TabWindow::removeEventListener( const css::uno::Reference< css::la
throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
return;
aLock.unlock();
@@ -517,7 +517,7 @@ void SAL_CALL TabWindow::windowShown( const css::lang::EventObject& )
throw( css::uno::RuntimeException, std::exception )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
TabControl* pTabControl = impl_GetTabControl( m_xTabControlWindow );
if ( pTabControl )
@@ -535,7 +535,7 @@ void SAL_CALL TabWindow::windowHidden( const css::lang::EventObject& )
throw( css::uno::RuntimeException, std::exception )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_xContainerWindow.is() )
{
Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
@@ -597,7 +597,7 @@ throw (css::uno::RuntimeException, std::exception)
throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
throw css::lang::DisposedException();
@@ -620,7 +620,7 @@ void SAL_CALL TabWindow::removeTab( ::sal_Int32 ID )
throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
throw css::lang::DisposedException();
@@ -653,7 +653,7 @@ void SAL_CALL TabWindow::setTabProps( ::sal_Int32 ID, const css::uno::Sequence<
throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
throw css::lang::DisposedException();
@@ -699,7 +699,7 @@ css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindow::getTabProps( ::
throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
throw css::lang::DisposedException();
@@ -734,7 +734,7 @@ void SAL_CALL TabWindow::activateTab( ::sal_Int32 ID )
throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
throw css::lang::DisposedException();
@@ -767,7 +767,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
throw css::lang::DisposedException();
@@ -791,7 +791,7 @@ void SAL_CALL TabWindow::addTabListener(
throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
return;
aLock.unlock();
@@ -805,7 +805,7 @@ void SAL_CALL TabWindow::removeTabListener( const css::uno::Reference< css::awt:
throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
return;
aLock.unlock();
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index b548672..373a48d 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -20,7 +20,7 @@
#include <tabwin/tabwinfactory.hxx>
#include <tabwin/tabwindow.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -80,7 +80,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
const OUString aTopWindowArgName( "TopWindow");
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
css::uno::Reference< css::awt::XToolkit2 > xToolkit = m_xToolkit;
css::uno::Reference< css::uno::XComponentContext > xContext( m_xContext );
aLock.unlock();
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 4b52cbb..437234c 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -18,7 +18,7 @@
*/
#include "uiconfiguration/globalsettings.hxx"
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include "services.h"
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -119,7 +119,7 @@ void SAL_CALL GlobalSettings_Access::dispose()
throw ( css::uno::RuntimeException, std::exception )
{
// SAFE
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
m_xConfigAccess.clear();
m_bDisposed = sal_True;
@@ -140,14 +140,14 @@ void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& )
throw (css::uno::RuntimeException, std::exception)
{
// SAFE
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
m_xConfigAccess.clear();
}
// settings access
sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eElementType )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( eElementType == GlobalSettings::UIELEMENT_TYPE_DOCKWINDOW )
return sal_False;
else if ( eElementType == GlobalSettings::UIELEMENT_TYPE_STATUSBAR )
@@ -185,7 +185,7 @@ sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eEl
sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( eElementType == GlobalSettings::UIELEMENT_TYPE_DOCKWINDOW )
return sal_False;
else if ( eElementType == GlobalSettings::UIELEMENT_TYPE_STATUSBAR )
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index b42a0b5..5fc2d30 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -19,7 +19,7 @@
#include <uiconfiguration/imagemanager.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <xml/imagesconfiguration.hxx>
#include <uiconfiguration/graphicnameaccess.hxx>
#include "imagemanagerimpl.hxx"
@@ -91,7 +91,7 @@ void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventLis
void ImageManager::setStorage( const uno::Reference< XStorage >& Storage )
throw (::com::sun::star::uno::RuntimeException)
{
- ResetableGuard aLock( m_pImpl->m_aLock );
+ Guard aLock( m_pImpl->m_aLock );
m_pImpl->m_xUserConfigStorage = Storage;
m_pImpl->implts_initialize();
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 076c629..5c6d2a6 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -19,7 +19,7 @@
#include <imagemanagerimpl.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <xml/imagesconfiguration.hxx>
#include <uiconfiguration/graphicnameaccess.hxx>
#include <services.h>
@@ -421,7 +421,7 @@ static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType )
ImageList* ImageManagerImpl::implts_getUserImageList( ImageType nImageType )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_pUserImageList[nImageType] )
implts_loadUserImages( nImageType, m_xUserImageStorage, m_xUserBitmapsStorage );
@@ -468,7 +468,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages(
const uno::Reference< XStorage >& xUserImageStorage,
const uno::Reference< XStorage >& xUserBitmapsStorage )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( xUserImageStorage.is() && xUserBitmapsStorage.is() )
{
@@ -548,7 +548,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
const uno::Reference< XStorage >& xUserImageStorage,
const uno::Reference< XStorage >& xUserBitmapsStorage )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bModified )
{
@@ -650,7 +650,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
const rtl::Reference< GlobalImageList >& ImageManagerImpl::implts_getGlobalImageList()
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_pGlobalImageList.is() )
m_pGlobalImageList = getGlobalImageList( m_xContext );
@@ -659,7 +659,7 @@ const rtl::Reference< GlobalImageList >& ImageManagerImpl::implts_getGlobalImage
CmdImageList* ImageManagerImpl::implts_getDefaultImageList()
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_pDefaultImageList )
m_pDefaultImageList = new CmdImageList( m_xContext, m_aModuleIdentifier );
@@ -701,7 +701,7 @@ void ImageManagerImpl::dispose()
m_aListenerContainer.disposeAndClear( aEvent );
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
m_xUserConfigStorage.clear();
m_xUserImageStorage.clear();
m_xUserRootCommit.clear();
@@ -723,7 +723,7 @@ void ImageManagerImpl::dispose()
void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
{
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -742,7 +742,7 @@ void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener
// XInitialization
void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( !m_bInitialized )
{
@@ -787,7 +787,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
void ImageManagerImpl::reset()
throw (::com::sun::star::uno::RuntimeException)
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -817,7 +817,7 @@ throw (::com::sun::star::uno::RuntimeException)
Sequence< OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType )
throw (::com::sun::star::uno::RuntimeException)
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -862,7 +862,7 @@ throw (::com::sun::star::uno::RuntimeException)
::sal_Bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -895,7 +895,7 @@ Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages(
const Sequence< OUString >& aCommandURLSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -950,7 +950,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
CmdToXGraphicNameAccess* pReplacedImages( 0 );
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -1033,7 +1033,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
CmdToXGraphicNameAccess* pReplacedImages( 0 );
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -1143,7 +1143,7 @@ void ImageManagerImpl::reload()
throw ( ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1295,7 +1295,7 @@ void ImageManagerImpl::store()
::com::sun::star::uno::RuntimeException,
std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1330,7 +1330,7 @@ void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage
::com::sun::star::uno::RuntimeException,
std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1361,13 +1361,13 @@ void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage
sal_Bool ImageManagerImpl::isModified()
throw (::com::sun::star::uno::RuntimeException)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return m_bModified;
}
sal_Bool ImageManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeException)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return m_bReadOnly;
}
// XUIConfiguration
@@ -1375,7 +1375,7 @@ void ImageManagerImpl::addConfigurationListener( const uno::Reference< ::com::su
throw (::com::sun::star::uno::RuntimeException)
{
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -1426,7 +1426,7 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent&
}
void ImageManagerImpl::clear()
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
for ( sal_Int32 n = 0; n < ImageType_COUNT; n++ )
{
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 8405d23..1387d06 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -19,7 +19,6 @@
#include <uiconfiguration/moduleimagemanager.hxx>
-#include <threadhelp/resetableguard.hxx>
#include <xml/imagesconfiguration.hxx>
#include <uiconfiguration/graphicnameaccess.hxx>
#include <services.h>
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 02c15be..a724e1d 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -20,7 +20,7 @@
#include <accelerators/presethandler.hxx>
#include <uiconfiguration/moduleimagemanager.hxx>
#include <threadhelp/threadhelpbase.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <stdtypes.h>
#include <uielement/constitemcontainer.hxx>
#include <uielement/rootitemcontainer.hxx>
@@ -869,7 +869,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT );
m_aUIElements[LAYER_USERDEFINED].resize( ::com::sun::star::ui::UIElementType::COUNT );
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if( aArguments.getLength() == 2 && (aArguments[0] >>= m_aModuleShortName) && (aArguments[1] >>= m_aModuleIdentifier))
{
@@ -939,7 +939,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u
m_aListenerContainer.disposeAndClear( aEvent );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
Reference< XComponent > xModuleImageManager( m_xModuleImageManager );
m_xModuleImageManager.clear();
Reference< XComponent > xCompMAM( m_xModuleAcceleratorManager, UNO_QUERY );
@@ -970,7 +970,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u
void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -990,7 +990,7 @@ void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference
void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -1010,7 +1010,7 @@ void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const R
// XUIConfigurationManager
void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -1101,7 +1101,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
throw IllegalArgumentException();
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1137,7 +1137,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1156,7 +1156,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
throw IllegalArgumentException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1179,7 +1179,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
throw IllegalArgumentException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1210,7 +1210,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
throw IllegalAccessException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1317,7 +1317,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
throw IllegalAccessException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1395,7 +1395,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
throw IllegalAccessException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1447,7 +1447,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1478,7 +1478,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1513,7 +1513,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
throw IllegalArgumentException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1536,7 +1536,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
throw IllegalArgumentException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1562,7 +1562,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
// XUIConfigurationPersistence
void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1603,7 +1603,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un
void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1636,7 +1636,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno
void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1669,14 +1669,14 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt
sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return m_bModified;
}
sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return m_bReadOnly;
}
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 33a0845..f531615 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <threadhelp/threadhelpbase.hxx>
#include <uiconfiguration/imagemanager.hxx>
#include <uielement/rootitemcontainer.hxx>
@@ -717,7 +717,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::Ru
m_aListenerContainer.disposeAndClear( aEvent );
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
try
{
if ( m_xImageManager.is() )
@@ -739,7 +739,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::Ru
void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -759,7 +759,7 @@ void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEve
void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -778,7 +778,7 @@ void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Referen
void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -867,7 +867,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT ))
throw IllegalArgumentException();
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -903,7 +903,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -940,7 +940,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
throw IllegalArgumentException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -971,7 +971,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
throw IllegalAccessException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1029,7 +1029,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
throw IllegalAccessException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1086,7 +1086,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
throw IllegalAccessException();
else
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1176,7 +1176,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw
Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
// SAFE ->
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if (!m_xAccConfig.is()) try
{
@@ -1200,7 +1200,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() thro
// XUIConfigurationStorage
void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1260,7 +1260,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1271,7 +1271,7 @@ sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::
// XUIConfigurationPersistence
void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1310,7 +1310,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc
void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1343,7 +1343,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce
void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -1376,14 +1376,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage
sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return m_bModified;
}
sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
return m_bReadOnly;
}
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 1a95e50..42b22c6 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -21,7 +21,7 @@
#include <uielement/toolbarmerger.hxx>
#include <uielement/generictoolbarcontroller.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include "services.h"
#include <framework/imageproducer.hxx>
#include <framework/sfxhelperfunctions.hxx>
@@ -145,7 +145,7 @@ void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException, std::exce
{
// Remove addon specific data from toolbar items.
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
for ( sal_uInt16 n = 0; n < m_pToolBar->GetItemCount(); n++ )
{
sal_uInt16 nId( m_pToolBar->GetItemId( n ) );
@@ -201,7 +201,7 @@ void AddonsToolBarManager::RefreshImages()
void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue > >& rAddonToolbar )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
return;
@@ -422,7 +422,7 @@ IMPL_LINK_NOARG(AddonsToolBarManager, DoubleClick)
IMPL_LINK_NOARG(AddonsToolBarManager, Command)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
return 1;
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index e0aa849..75418fa 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -18,7 +18,7 @@
*/
#include <uielement/addonstoolbarwrapper.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <framework/actiontriggerhelper.hxx>
#include <uielement/constitemcontainer.hxx>
#include <uielement/rootitemcontainer.hxx>
@@ -71,7 +71,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exc
com::sun::star::lang::EventObject aEvent( xThis );
m_aListenerContainer.disposeAndClear( aEvent );
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_xToolBarManager.is() )
m_xToolBarManager->dispose();
@@ -83,7 +83,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exc
// XInitialization
void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_bDisposed )
throw DisposedException();
@@ -145,7 +145,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
// XUIElement interface
Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if ( m_xToolBarManager.is() )
{
@@ -163,7 +163,7 @@ Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw
// allow late population of images for add-on toolbars
void AddonsToolBarWrapper::populateImages()
{
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
if (m_bCreatedImages)
return;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 67b67d2..fb31800 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <threadhelp/resetableguard.hxx>
#include <stdtypes.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index be85882..14b00fb 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -19,7 +19,6 @@
#include <uielement/fontmenucontroller.hxx>
-#include <threadhelp/resetableguard.hxx>
#include "services.h"
#include <com/sun/star/awt/XDevice.hpp>
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 124c292..6154088 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -19,7 +19,6 @@
#include <uielement/fontsizemenucontroller.hxx>
-#include <threadhelp/resetableguard.hxx>
#include "services.h"
#include <com/sun/star/awt/XDevice.hpp>
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 1b866b0..454a51e 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -19,7 +19,6 @@
#include <uielement/footermenucontroller.hxx>
-#include <threadhelp/resetableguard.hxx>
#include "services.h"
#include <classes/resource.hrc>
#include <classes/fwlresid.hxx>
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 273956e..3ba2c31 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -19,7 +19,6 @@
#include <uielement/headermenucontroller.hxx>
-#include <threadhelp/resetableguard.hxx>
#include "services.h"
#include <classes/resource.hrc>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 952a03b..1dea200 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -20,7 +20,6 @@
#include <uielement/langselectionmenucontroller.hxx>
-#include <threadhelp/resetableguard.hxx>
#include "services.h"
#include <com/sun/star/awt/XDevice.hpp>
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 5c09791..ed33743 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -20,7 +20,6 @@
#include <uielement/macrosmenucontroller.hxx>
#include <uielement/menubarmanager.hxx>
-#include <threadhelp/resetableguard.hxx>
#include "services.h"
#include <classes/resource.hrc>
#include <classes/fwkresid.hxx>
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 228e7a3..1773666 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -22,7 +22,7 @@
#include <framework/bmkmenu.hxx>
#include <framework/addonmenu.hxx>
#include <framework/imageproducer.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include "framework/addonsoptions.hxx"
#include <classes/fwkresid.hxx>
#include <classes/menumanager.hxx>
@@ -258,7 +258,7 @@ void SAL_CALL MenuBarManager::release() throw()
Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw com::sun::star::lang::DisposedException();
@@ -335,7 +335,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception
m_aListenerContainer.disposeAndClear( aEvent );
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
Destroy();
m_bDisposed = sal_True;
@@ -379,7 +379,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception
void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -390,7 +390,7 @@ void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener
void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
}
@@ -398,7 +398,7 @@ void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListen
void SAL_CALL MenuBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event )
throw (RuntimeException, std::exception)
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
if ( m_bDisposed )
@@ -427,7 +427,7 @@ throw (RuntimeException, std::exception)
void SAL_CALL MenuBarManager::frameAction( const FrameActionEvent& Action )
throw ( RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
throw com::sun::star::lang::DisposedException();
@@ -452,7 +452,7 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard aSolarGuard;
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( m_bDisposed )
return;
@@ -541,7 +541,7 @@ throw ( RuntimeException, std::exception )
// Helper to retrieve own structure from item ID
MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16 nItemId )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
std::vector< MenuItemHandler* >::iterator p;
for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
@@ -574,7 +574,7 @@ void MenuBarManager::RequestImages()
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list